diff --git a/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java b/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
index 6f049439..678d9305 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
@@ -12,6 +12,9 @@ public class TablistNameHandler implements SpigotHandler {
     @Override
     public void handle(ByteArrayDataInput byteArrayDataInput) {
         ProxiedPlayer player = ProxyServer.getInstance().getPlayer(SteamwarUser.get(byteArrayDataInput.readInt()).getUuid());
-        Subserver.getSubserver(player).getTablistNames().put(player, byteArrayDataInput.readUTF());
+        Subserver subserver = Subserver.getSubserver(player.getServer().getInfo());
+        if(subserver == null)
+            return;
+        subserver.getTablistNames().put(player, byteArrayDataInput.readUTF());
     }
 }