Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision ab8fd4016449008d0189af819837030c163e458a)
+++ server/server.cpp	(revision 3ef8cf48cc9aac7dd885ba9eac6507aeb5e902c2)
@@ -941,4 +941,5 @@
          // check if this game already exists
          if (mapGames.find(gameName) != mapGames.end()) {
+            cout << "Error: Game already exists" << endl;
             serverMsg.type = MSG_TYPE_JOIN_GAME_FAILURE;
             broadcastResponse = false;
@@ -967,4 +968,5 @@
          // check if this game already exists
          if (mapGames.find(gameName) == mapGames.end()) {
+            cout << "Error: Game does not exist" << endl;
             serverMsg.type = MSG_TYPE_JOIN_GAME_FAILURE;
             broadcastResponse = false;
@@ -1007,5 +1009,6 @@
 
          cout << "Game name: " << g->getName() << endl;
-         //p->currentGame = NULL;
+         p->currentGame = NULL;
+         g->removePlayer(p->id);
 
          // broadcast a messsage to other players so they know someone left the game