diff --git a/src/main/java/seng302/visualiser/ClientToServerThread.java b/src/main/java/seng302/visualiser/ClientToServerThread.java
index 3d6152d8..57256760 100644
--- a/src/main/java/seng302/visualiser/ClientToServerThread.java
+++ b/src/main/java/seng302/visualiser/ClientToServerThread.java
@@ -338,6 +338,8 @@ public class ClientToServerThread implements Runnable {
             closeSocket();
         }
         if (currentByte == -1) {
+            notifyDisconnectListeners("Cannot read from server.");
+            closeSocket();
             logger.warn("InputStream reach end of stream", 1);
         }
         return currentByte;