diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
index 57e3fe1..805edb7 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Lobby.java
@@ -235,7 +235,11 @@ public class Lobby {
    */
   public void closeLobby() {
     lobbies.remove(this);
-    game.setOngoing(false); // ends game
+    try {
+      game.setOngoing(false); // ends game
+    } catch (NullPointerException e) {
+      LOGGER.info("No game has been started yet");
+    }
     //ClientHandler.broadcastAnnouncementToAll("Lobby nr. " + this.getLobbyID() + " has been closed.");
 
     /*