From 6fcb99693828259aa3d41a4d9b195495f33942ea Mon Sep 17 00:00:00 2001
From: "Peter F. Patel-Schneider" <pfpschneider@gmail.com>
Date: Tue, 19 Feb 2019 08:10:09 -0500
Subject: [PATCH] fix crash when showing uninitialized zone

---
 .../main/java/forge/view/arcane/FloatingZone.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
index 30272ada920..ad196caee83 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
@@ -123,11 +123,16 @@ public class FloatingZone extends FloatingCardArea {
 	};
 
     protected Iterable<CardView> getCards() {
-	cardList = new FCollection<CardView>(player.getCards(zone));
-	if ( sortedByName ) {
-	    Collections.sort(cardList, comp);
-	}
-	return cardList;
+          Iterable<CardView> zoneCards = player.getCards(zone);
+        if ( zoneCards != null ) {
+            cardList = new FCollection<CardView>(player.getCards(zone));
+            if ( sortedByName ) {
+                Collections.sort(cardList, comp);
+            }
+            return cardList;
+        } else {
+            return null;
+        }
     }
 
     private FloatingZone(final CMatchUI matchUI, final PlayerView player0, final ZoneType zone0) {