diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java index 06864109f7d..a903826a48a 100644 --- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java +++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java @@ -749,7 +749,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { inp.setCancelAllowed(!mustChoose); inp.setMessage(selectPrompt); FThreads.setInputAndWait(inp); - c = inp.getSelected().get(0); + c = inp.hasCancelled() ? null : inp.getSelected().get(0); } else { List chosen = GuiChoose.getChoices(selectPrompt, 0, mustChoose ? 1 : 0, fetchList);