From 8f2123f183392e9107c85f1d815afc1c97c830c2 Mon Sep 17 00:00:00 2001
From: "Peter F. Patel-Schneider" <pfpschneider@gmail.com>
Date: Thu, 17 Jan 2019 16:02:22 -0500
Subject: [PATCH] add fix to crash when selecting targets

---
 .../java/forge/match/input/InputSelectEntitiesFromList.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
index 1d018a02394..67f88228108 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
@@ -36,7 +36,9 @@ public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSele
 	final PlayerZoneUpdates zonesToUpdate = new PlayerZoneUpdates();
 	for (final GameEntity c : validChoices) {
             final Zone cz = (c instanceof Card) ? ((Card) c).getZone() : null ;
-	    zonesToUpdate.add(new PlayerZoneUpdate(cz.getPlayer().getView(),cz.getZoneType()));
+	    if ( cz != null ) {
+		zonesToUpdate.add(new PlayerZoneUpdate(cz.getPlayer().getView(),cz.getZoneType()));
+	    }
 	}
 	FThreads.invokeInEdtNowOrLater(new Runnable() {
             @Override public void run() {