diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java
index 87999170a7..c30dfb512f 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java
@@ -70,7 +70,6 @@ public class GoryosVengeance extends CardImpl {
         this.expansionSetCode = "BOK";
         this.subtype.add("Arcane");
 
-
         // Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.
         this.getSpellAbility().addEffect(new GoryosVengeanceEffect());
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
@@ -119,8 +118,8 @@ class GoryosVengeanceEffect extends OneShotEffect {
                         effect.setTargetPointer(new FixedTarget(permanent.getId()));
                         game.addEffect(effect, source);
                         // Exile it at end of turn
-                        Effect exileEffect = new ExileTargetEffect(new StringBuilder("Exile ").append(permanent.getName()).append(" at the beginning of the next end step").toString());
-                        exileEffect.setTargetPointer(new FixedTarget(card.getId()));
+                        Effect exileEffect = new ExileTargetEffect("Exile " + permanent.getName() + " at the beginning of the next end step");
+                        exileEffect.setTargetPointer(new FixedTarget(permanent, game));
                         DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(exileEffect);
                         delayedAbility.setSourceId(source.getSourceId());
                         delayedAbility.setControllerId(source.getControllerId());
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index 44d164941f..eb175ea8a2 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -2926,6 +2926,9 @@ public abstract class PlayerImpl implements Player, Serializable {
 
     @Override
     public boolean moveCards(Cards cards, Zone fromZone, Zone toZone, Ability source, Game game) {
+        if (cards.isEmpty()) {
+            return true;
+        }
         Set<Card> cardList = new HashSet<>();
         for (UUID cardId : cards) {
             fromZone = game.getState().getZone(cardId);