diff --git a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
index d478125..6f30116 100644
--- a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
+++ b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
@@ -118,7 +118,7 @@ public class ServerLauncher {
                     if(this.gameController.getModel().getCurrentState().getGameStage() == GameStages.ENDED){
                         this.deleteSave();
                         for(Map.Entry<String,Boolean> entry:playerList.entrySet()){
-                            if(entry.getValue())
+                            if(!entry.getValue())
                                 playerList.remove(entry.getKey());
                         }
                         serverRMI.setServerCrashed(false);
@@ -144,6 +144,10 @@ public class ServerLauncher {
             if(event.getEventType().equals(EventType.DISCONNECTED_PLAYER))
             {
                 playerList.remove(event.getUsername());
+                if(playerList.isEmpty())
+                {
+                    gameController.setModel(null);
+                }
             }
             return false;
         }