diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java
index 9b34753da42..9d7ec3c27f9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java
@@ -85,7 +85,7 @@ public class CursesTest extends CardTestPlayerBase {
     }
 
     /**
-     * Checks if Copy Enchantment works for palyer auras
+     * Checks if Copy Enchantment works for player auras
      */
     @Test
     public void testCurseOfExhaustion3() {        
@@ -94,6 +94,8 @@ public class CursesTest extends CardTestPlayerBase {
         
         addCard(Zone.BATTLEFIELD, playerB, "Island", 3);        
         
+        // Enchant player
+        // Enchanted player can't cast more than one spell each turn.
         addCard(Zone.HAND, playerA, "Curse of Exhaustion");
         addCard(Zone.HAND, playerA, "Lightning Bolt", 2);        
         
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java
new file mode 100644
index 00000000000..43972c27133
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.triggers.dies;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class XathridNecromancerTest extends CardTestPlayerBase {
+
+    /**
+     * My opponent had 2 Human Tokens from Gather the Townsfolk and a Xathrid Necromancer.
+     * ( Whenever Xathrid Necromancer or another Human creature you control dies, put a 2/2 black Zombie creature token onto the battlefield tapped. )
+     * All 3 of them died in combat but he only got 1 Zombie token.
+     * There was no first strike damage involved.
+     * 
+     */
+    @Test
+    public void testDiesTriggeredAbility() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        // Creature - Human Wizard
+        // 2/2
+        // Whenever Xathrid Necromancer or another Human creature you control dies, put a 2/2 black Zombie creature token onto the battlefield tapped.
+        addCard(Zone.BATTLEFIELD, playerA, "Xathrid Necromancer", 1);
+        // Put two 1/1 white Human creature tokens onto the battlefield.
+        // Fateful hour - If you have 5 or less life, put five of those tokens onto the battlefield instead.
+        addCard(Zone.HAND, playerA, "Gather the Townsfolk");
+
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Siege Mastodon", 1);
+        
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Gather the Townsfolk");
+
+        attack(2, playerB, "Silvercoat Lion");
+        attack(2, playerB, "Pillarfield Ox");
+        attack(2, playerB, "Siege Mastodon");
+
+        block(2, playerA, "Human", "Silvercoat Lion");
+        block(2, playerA, "Human", "Pillarfield Ox");
+        block(2, playerA, "Xathrid Necromancer", "Siege Mastodon");
+        
+        setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertGraveyardCount(playerA, "Xathrid Necromancer", 1);
+        assertGraveyardCount(playerA, "Gather the Townsfolk", 1);
+
+        assertPermanentCount(playerA, "Human", 0);
+        assertPermanentCount(playerA, "Zombie", 3);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+        
+    }
+
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
index 95c2db58ecc..d4f3fa7ec29 100644
--- a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
@@ -27,6 +27,7 @@
  */
 package mage.abilities.common;
 
+import mage.MageObject;
 import mage.constants.Zone;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
@@ -66,7 +67,12 @@ public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityI
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.ZONE_CHANGE;
     }
-
+    
+    @Override
+    public boolean isInUseableZone(Game game, MageObject source, GameEvent event) {
+        return game.getState().getZone(getSourceId()) == Zone.BATTLEFIELD || game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD) != null; 
+    }
+    
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
diff --git a/Mage/src/mage/abilities/effects/ContinuousEffectsList.java b/Mage/src/mage/abilities/effects/ContinuousEffectsList.java
index 68b230e3faa..cbad22a927f 100644
--- a/Mage/src/mage/abilities/effects/ContinuousEffectsList.java
+++ b/Mage/src/mage/abilities/effects/ContinuousEffectsList.java
@@ -173,10 +173,10 @@ public class ContinuousEffectsList<T extends ContinuousEffect> extends ArrayList
 
     public void removeEffects(UUID effectIdToRemove, Set<Ability> abilitiesToRemove) {
         HashSet<Ability> abilities = effectAbilityMap.get(effectIdToRemove);
-        if (abilitiesToRemove != null) {
+        if (abilitiesToRemove != null && abilities != null) {
             abilities.removeAll(abilitiesToRemove);
         }
-        if (abilities.isEmpty()) {
+        if (abilities == null || abilities.isEmpty()) {
             for (Iterator<T> iterator = this.iterator(); iterator.hasNext();) {
                 ContinuousEffect effect = iterator.next();
                 if (effect.getId().equals(effectIdToRemove)) {