diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
index d70f538..f2e0574 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
@@ -461,8 +461,9 @@ public class ClientHandler implements Runnable {
    */
   public void disconnectClient() {
     Lobby l = getLobby();
-    Game g = l.getGame();
-    if (l != null && g != null) {
+    if (l != null) {
+      Game g = l.getGame();
+      if(g != null)
       l.getGame().getGameState().handleClientDisconnect(this);
     }
     socket = this.getSocket();