From f2fc548f089c2b678d52d466501359f27e2015e9 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 30 Jul 2014 20:07:55 +0200
Subject: [PATCH] * Fixed ChatSession handling.

---
 Mage.Server/src/main/java/mage/server/ChatManager.java  | 2 --
 Mage.Server/src/main/java/mage/server/TableManager.java | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java
index e9aefd07282..bbe69dbe0c5 100644
--- a/Mage.Server/src/main/java/mage/server/ChatManager.java
+++ b/Mage.Server/src/main/java/mage/server/ChatManager.java
@@ -72,8 +72,6 @@ public class ChatManager {
     public void leaveChat(UUID chatId, UUID userId) {
         if (chatSessions.containsKey(chatId)) {
             chatSessions.get(chatId).kill(userId, DisconnectReason.CleaningUp);
-        } else {
-            logger.debug("ChatManager:leaveChat - chatId does not exist - chatId: " + chatId +"  userId: " + userId);
         } 
     }
 
diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java
index 0f8e8c8256b..ccd95502900 100644
--- a/Mage.Server/src/main/java/mage/server/TableManager.java
+++ b/Mage.Server/src/main/java/mage/server/TableManager.java
@@ -204,9 +204,12 @@ public class TableManager {
 
     public boolean removeTable(UUID userId, UUID tableId) {
         if (isTableOwner(tableId, userId) || UserManager.getInstance().isAdmin(userId)) {
-            leaveTable(userId, tableId);            
-            ChatManager.getInstance().destroyChatSession(controllers.get(tableId).getChatId());  
-            removeTable(tableId);
+            leaveTable(userId, tableId);
+            TableController tableController = controllers.get(tableId);
+            if (tableController != null) {
+                ChatManager.getInstance().destroyChatSession(tableController.getChatId());
+                removeTable(tableId);
+            }
             return true;
         }
         return false;