diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index 590ef93a..43944d72 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -217,12 +217,13 @@ public class BauCommand {
         }
 
         target.remove();
-        ProxiedPlayer z = ProxyServer.getInstance().getPlayer(SteamwarUser.get(target.getMemberID()).getUuid());
-        if(z != null){
-            Message.send("BAU_DELMEMBER_DELETED_TARGET", z, p.getName());
-            Subserver server = Subserver.getSubserver(z);
-            if(server != null && server.getType() == Servertype.BAUSERVER && ((Bauserver)server).getOwner().equals(p.getUniqueId()))
-                z.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LOBBY_SERVER));
+        ProxiedPlayer toRemove = ProxyServer.getInstance().getPlayer(SteamwarUser.get(target.getMemberID()).getUuid());
+        if(toRemove != null){
+            Message.send("BAU_DELMEMBER_DELETED_TARGET", toRemove, p.getName());
+            Subserver currentServer = Subserver.getSubserver(toRemove.getServer().getInfo());
+            if (currentServer != null && currentServer.getType() == Servertype.BAUSERVER && ((Bauserver) currentServer).getOwner().equals(p.getUniqueId())) {
+                toRemove.connect(ProxyServer.getInstance().getServerInfo(BungeeCore.LOBBY_SERVER));
+            }
         }
         Message.send("BAU_DELMEMBER_DELETED", p);
     }