diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index b09c98e59b3..e6c6a6ee86a 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -327,23 +327,23 @@ public class User {
     }
 
     public void kill(DisconnectReason reason) {
-        logger.debug("start user kill");
+        logger.debug("user.kill before game session " + gameSessions.size() );
         for (GameSession gameSession: gameSessions.values()) {
             gameSession.kill();
         }
-        logger.debug("user kill after game");
+        logger.debug("user.kill before draft session " + draftSessions.size());
         for (DraftSession draftSession: draftSessions.values()) {
             draftSession.setKilled();
         }
-        logger.debug("user kill after draft");
+        logger.debug("user.kill before tournament session " + tournamentSessions.size());
         for (TournamentSession tournamentSession: tournamentSessions.values()) {
             tournamentSession.setKilled();
         }
-        logger.debug("user kill after tournament");
+        logger.debug("user.kill before tables " + tables.size());
         for (Entry<UUID, Table> entry: tables.entrySet()) {
             TableManager.getInstance().leaveTable(userId, entry.getValue().getId());
         }
-        logger.debug("user kill after table");
+        logger.debug("user.kill before chat remove user");
         ChatManager.getInstance().removeUser(userId, reason);
     }
 
diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
index 09eebef9595..47bf8aca3bf 100644
--- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
+++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
@@ -149,7 +149,15 @@ public class TournamentController {
 
     public synchronized void join(UUID userId) {
         UUID playerId = userPlayerMap.get(userId);
+        if (playerId == null) {
+            logger.error("join: got no playerId  for userId: " + userId + " for tournament " + tournament.getId());
+            return;
+        }
         TournamentSession tournamentSession = new TournamentSession(tournament, userId, tableId, playerId);
+        if (tournamentSessions == null) {
+            logger.error("join: got no playerId  for userId: " + userId + " for tournament " + tournament.getId());
+            return;
+        }
         tournamentSessions.put(playerId, tournamentSession);
         UserManager.getInstance().getUser(userId).addTournament(playerId, tournamentSession);
         TournamentPlayer player = tournament.getPlayer(playerId);
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index a98c99dffa6..1f6e48eb876 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -946,13 +946,13 @@ public abstract class GameImpl implements Game, Serializable {
         if (state != null) {
             Player player = state.getPlayer(playerId);
             if (player != null) {
-                logger.debug(player.getName() + " quits the game");
+                logger.debug("gameImpl.quit" + player.getName() + " quits the game");
                 player.quit(this);
             }else {
-                logger.error(new StringBuilder("quit - player not found - playerId: ").append(playerId));
+                logger.error(new StringBuilder("gameImpl.quit - player not found - playerId: ").append(playerId));
             }
         } else {
-            logger.error(new StringBuilder("quit - state not found - playerId: ").append(playerId));
+            logger.error(new StringBuilder("gameImpl.quit - state not found - playerId: ").append(playerId));
         }
     }