From e4b146128c5ff4f9c127419a42be056e62a43e1c Mon Sep 17 00:00:00 2001
From: "Jamin W. Collins" <jamin.collins@gmail.com>
Date: Sat, 8 Sep 2018 10:56:59 -0600
Subject: [PATCH] avoid an NPE when no cards are chosen

Closes: core-developers/forge#680

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
---
 .../main/java/forge/game/ability/effects/ChangeZoneEffect.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 5e72cd9fdf4..dcf79e209af 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -891,7 +891,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             // ensure that selection is within maximum allowed changeNum
             do {
                 selectedCards = decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider);
-            } while (selectedCards.size() > changeNum);
+            } while (selectedCards != null && selectedCards.size() > changeNum);
             for (Card card : selectedCards) {
                 chosenCards.add(card);
             };