diff --git a/src/de/steamwar/bungeecore/Subserver.java b/src/de/steamwar/bungeecore/Subserver.java
index 64460ee..aa1e181 100644
--- a/src/de/steamwar/bungeecore/Subserver.java
+++ b/src/de/steamwar/bungeecore/Subserver.java
@@ -158,7 +158,7 @@ public class Subserver implements Runnable, Listener {
     @EventHandler
     public void onServerSwitchEvent(ServerConnectedEvent e){
         ProxiedPlayer player = e.getPlayer();
-        if(player.getServer().getInfo().equals(server))
+        if(player.getServer() == null || player.getServer().getInfo() == null || player.getServer().getInfo().equals(server))
             return;
 
         Iterator<ProxiedPlayer> it = cachedPlayers.iterator();