diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index fcf1003f825..b174517f960 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -216,6 +216,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
                     return true;
                 }
             }
+            return false;
         }
         if (target instanceof TargetCardInHand) {
             List<Card> cards = new ArrayList<Card>();
@@ -261,6 +262,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
                 return false;
             }
         }
+
         if (target instanceof TargetPermanentOrPlayer) {
             List<Permanent> targets;
             TargetPermanentOrPlayer t = ((TargetPermanentOrPlayer) target);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java
index 27bf65c0ef6..dd24754e34a 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/FaerieImpostor.java
@@ -82,11 +82,10 @@ public class FaerieImpostor extends CardImpl<FaerieImpostor> {
 
 class FaerieImpostorEffect extends OneShotEffect<FaerieImpostorEffect> {
 
-    private static final FilterControlledCreaturePermanent filter;
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
     private static final String effectText = "sacrifice it unless you return another creature you control to its owner's hand";
 
     static {
-        filter = new FilterControlledCreaturePermanent("another creature you control");
         filter.add(new AnotherPredicate());
     }
 
@@ -111,7 +110,7 @@ class FaerieImpostorEffect extends OneShotEffect<FaerieImpostorEffect> {
 
             if ( permanent != null ) {
                 targetChosen = true;
-                permanent.moveToZone(Zone.HAND, this.getId(), game, false);
+                permanent.moveToZone(Zone.HAND, source.getSourceId(), game, false);
             }
         }
 
@@ -128,4 +127,3 @@ class FaerieImpostorEffect extends OneShotEffect<FaerieImpostorEffect> {
     }
 
 }
-