diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index c303731c9f..ac0be0c613 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -399,7 +399,7 @@ public class ContinuousEffects implements Serializable { ReplacementEffect entry = it1.next(); if (consumed.containsKey(entry.getId())) { HashSet consumedAbilitiesIds = consumed.get(entry.getId()); - if (consumedAbilitiesIds.size() == ((HashSet) rEffects.get(entry)).size()) { + if (rEffects.get(entry) == null || consumedAbilitiesIds.size() == ((HashSet) rEffects.get(entry)).size()) { it1.remove(); } else { Iterator it = ((HashSet) rEffects.get(entry)).iterator();