diff --git a/apps/openmw-mp/MasterClient.cpp b/apps/openmw-mp/MasterClient.cpp
index 2427e6008..becff6899 100644
--- a/apps/openmw-mp/MasterClient.cpp
+++ b/apps/openmw-mp/MasterClient.cpp
@@ -164,7 +164,7 @@ void MasterClient::Update()
 
         RakSleep(timeout);
 
-        players = mwmp::Networking::get().numberOfConnections();
+        players = Players::getPlayers()->size();
         response = Send(hostname, modname, maxPlayers, update, players);
         update = true;
     }
diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index 08f4e34b8..c9cf8d4ef 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -828,7 +828,8 @@ int Networking::mainLoop()
                         bs.Write(RakNet::RakString(player.second->npc.mName.c_str()));
                     bs.Write(0); // plugins
                     peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, packet->systemAddress, false);
-                        break;
+                    peer->CloseConnection(packet->guid, false);
+                    break;
                 }
                 default:
                     update(packet);
diff --git a/apps/openmw-mp/main.cpp b/apps/openmw-mp/main.cpp
index 56ec690ff..ee6b7e558 100644
--- a/apps/openmw-mp/main.cpp
+++ b/apps/openmw-mp/main.cpp
@@ -120,11 +120,6 @@ std::string loadSettings (Settings::Manager & settings)
     return settingspath;
 }
 
-void queryThread(MasterClient *mclient)
-{
-    mclient->Update();
-}
-
 class Tee : public boost::iostreams::sink
 {
 public: