diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java
index 8ed7ae47dc..067e9b5282 100644
--- a/Mage/src/mage/abilities/TriggeredAbilities.java
+++ b/Mage/src/mage/abilities/TriggeredAbilities.java
@@ -49,9 +49,9 @@ public class TriggeredAbilities extends AbilitiesImpl<TriggeredAbility> {
 
     public void checkTriggers(GameEvent event, Game game) {
         for (TriggeredAbility ability: this) {
-            if (ability.isInUseableZone(game)) {
+            if (event.getType() == GameEvent.EventType.ZONE_CHANGE || ability.isInUseableZone(game)) {
                 MageObject object = game.getObject(ability.getSourceId());
-                if (object.getAbilities().contains(ability)) {
+                if (object != null && object.getAbilities().contains(ability)) {
                     if (ability.checkTrigger(event, game)) {
                         ability.trigger(game, ability.getControllerId());
                     }