diff --git a/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java b/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
index c488486b06..8e12070a3c 100644
--- a/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
+++ b/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
@@ -83,6 +83,9 @@ class FaldornDreadWolfHeraldTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
+        if (!this.isControlledBy(event.getPlayerId())) {
+            return false;
+        }
         switch (event.getType()) {
             case ENTERS_THE_BATTLEFIELD:
                 EntersTheBattlefieldEvent eEvent = (EntersTheBattlefieldEvent) event;
@@ -91,6 +94,7 @@ class FaldornDreadWolfHeraldTriggeredAbility extends TriggeredAbilityImpl {
                 return Optional
                         .ofNullable(game.getSpell(event.getTargetId()))
                         .map(Spell::getFromZone)
+                        .orElse(Zone.ALL)
                         .equals(Zone.EXILED);
         }
         return false;