diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 8e155ab5..6a74970b 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -141,6 +141,8 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
     public void clientDisconnected(Player player) {
         serverLog("Player disconnected", 0);
         GameState.removePlayer(player);
+        setChanged();
+        notifyObservers();
 //        sendXml();
     }
 
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index ed2563c5..9418e6d9 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -1,6 +1,7 @@
 package seng302.gameServer;
 
 
+import com.sun.xml.internal.bind.v2.TODO;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -218,8 +219,8 @@ public class ServerToClientThread implements Runnable, Observer {
                     }
                 }
             } catch (Exception e) {
+                // TODO: 24/07/17 zyt10 - fix a logic here when a client disconnected 
                 serverLog("ERROR OCCURRED, CLOSING SERVER CONNECTION: " + socket.getRemoteSocketAddress().toString(), 1);
-                e.printStackTrace();
                 closeSocket();
                 return;
             }