diff --git a/src/main/java/net/krakatoa/proxy/ProxySystem.java b/src/main/java/net/krakatoa/proxy/ProxySystem.java
index cbd6ea4..de8430a 100644
--- a/src/main/java/net/krakatoa/proxy/ProxySystem.java
+++ b/src/main/java/net/krakatoa/proxy/ProxySystem.java
@@ -88,7 +88,8 @@ public class ProxySystem extends Plugin {
 
   public void loadListeners() {
     PluginManager pluginManager = getProxy().getPluginManager();
-    Arrays.asList(new PostLoginListener(), new PlayerDisconnectListener(), new LoginListener())
+    Arrays.asList(new PostLoginListener(), new PlayerDisconnectListener(), new LoginListener(),
+            new ServerSwitchListener())
         .forEach(listener -> {
           pluginManager.registerListener(this, listener);
         });
diff --git a/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java b/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java
index 85b053d..0a803f7 100644
--- a/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java
+++ b/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java
@@ -52,8 +52,12 @@ public class PlayerDisconnectListener implements Listener {
 
             ProxySystem.getInstance().getMongoManager().getPlayers()
                 .updateOne(document, updates, options, (result, t) -> {
-                  System.out.println("Modified document count: " + result.getModifiedCount());
-                  System.out.println("Upserted id: " + result.getUpsertedId());
+                  System.out.println(result == null);
+
+                  if (result != null) {
+                    System.out.println("Modified document count: " + result.getModifiedCount());
+                    System.out.println("Upserted id: " + result.getUpsertedId());
+                  }
                 });
           } else {
             System.out.println("Mongo player is null on disconnect");