From e9be6c9152ff4856e7a1a0d4c9c662d478c5ad90 Mon Sep 17 00:00:00 2001
From: Myrd <myrd@cardforge.org>
Date: Thu, 18 Dec 2014 17:50:43 +0000
Subject: [PATCH] Couple fixes to game state save/restore logic.

---
 .../src/main/java/forge/player/PlayerControllerHuman.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index b649b83c424..9e7048621f5 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -1445,7 +1445,11 @@ public class PlayerControllerHuman extends PlayerController {
                     bw.close();
                 }
             } catch (Exception e) {
-                SOptionPane.showErrorDialog(e.getMessage());
+                String err = e.getClass().getName();
+                if (e.getMessage() != null) {
+                    err += ": " + e.getMessage();
+                }
+                SOptionPane.showErrorDialog(err);
                 e.printStackTrace();
             }
         }
@@ -1478,6 +1482,7 @@ public class PlayerControllerHuman extends PlayerController {
             Player pPriority = game.getPhaseHandler().getPriorityPlayer();
             if (pPriority == null) {
                 SGuiDialog.message("No player has priority at the moment, so game state cannot be setup.");
+                return;
             }
             state.applyToGame(game);
         }