From ffcdb51d1b2b67df68f42ff3d70d9be036ead206 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 1 Jun 2014 23:23:22 +0200
Subject: [PATCH] Fixed a possible NPE in GameController.

---
 Mage.Server/src/main/java/mage/server/game/GameController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java
index df5cc82bdb7..373a293194e 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameController.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameController.java
@@ -675,7 +675,7 @@ public class GameController implements GameCallback {
         if (players != null && players.size() > 0) {
             controller = game.getPlayer(players.get(0));
         }
-        if (controller == null) {
+        if (controller == null || game.getStep() == null || game.getStep().getType() == null) {
             return;
         }
         final String message = new StringBuilder(game.getStep().getType().toString()).append(" - Waiting for ").append(controller.getName()).toString();