diff --git a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
index 3383068261..f50ca1d935 100644
--- a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
@@ -75,7 +75,12 @@ public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbili
         if (event.getType() == EventType.ZONE_CHANGE) {
             ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
             if ((fromZone == null || zEvent.getFromZone() == fromZone) && (toZone == null || zEvent.getToZone() == toZone)) {
-                Permanent perm = game.getPermanent(event.getTargetId());
+                Permanent perm;
+                if (zEvent.getTarget() != null) {
+                    perm = zEvent.getTarget();
+                } else {
+                    perm = game.getPermanent(event.getTargetId()); // LevelX2: maybe this part is not neccessary
+                }
                 if (perm != null && filter.match(perm, sourceId, controllerId, game)) {
                     return true;
                 }
diff --git a/Mage/src/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/mage/abilities/keyword/ProtectionAbility.java
index a08eeba1e9..40f7b2b15f 100644
--- a/Mage/src/mage/abilities/keyword/ProtectionAbility.java
+++ b/Mage/src/mage/abilities/keyword/ProtectionAbility.java
@@ -67,18 +67,21 @@ public class ProtectionAbility extends StaticAbility<ProtectionAbility> {
 
     public boolean canTarget(MageObject source, Game game) {
         if (filter instanceof FilterPermanent) {
-            if (source instanceof Permanent)
+            if (source instanceof Permanent) {
                 return !filter.match(source, game);
+            }
             return true;
         }
         if (filter instanceof FilterSpell) {
-            if (source instanceof Spell)
+            if (source instanceof Spell) {
                 return !filter.match(source, game);
+            }
             return true;
         }
         if (filter instanceof FilterCard) {
-            if (source instanceof Card)
+            if (source instanceof Card) {
                 return !filter.match(source, game);
+            }
             return true;
         }
         if (filter instanceof FilterObject) {