diff --git a/.gitmodules b/.gitmodules
index ffabdd8..1b213d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "CommonCore"]
 	path = CommonCore
 	url = https://steamwar.de/devlabs/SteamWar/CommonCore.git
+	branch = master
diff --git a/CommonCore b/CommonCore
index e83103d..0f03b57 160000
--- a/CommonCore
+++ b/CommonCore
@@ -1 +1 @@
-Subproject commit e83103d8afce8161a12d008d6ad99ba439243b27
+Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df
diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 7c585ff..4fa1cf8 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -86,16 +86,14 @@ public class TpCommand extends BasicCommand {
         } else if(subserver instanceof Bauserver) {
             Bauserver bauserver = (Bauserver) subserver;
             ProxiedPlayer checker = BungeeCord.getInstance().getPlayer(bauserver.getOwner());
-            if (CheckCommand.isChecking(checker)) {
+            if (checker != null && CheckCommand.isChecking(checker)) {
                 SteamwarUser steamwarUser = SteamwarUser.get(player);
                 if (steamwarUser.getUserGroup().isCheckSchematics() || CheckCommand.getCheckingSchem(checker).getOwner() == steamwarUser.getId()) {
                     SubserverSystem.sendPlayer(subserver, player);
-                    return;
+                } else {
+                    sender.system("JOIN_PLAYER_BLOCK");
                 }
-                sender.system("JOIN_PLAYER_BLOCK");
-                return;
-            }
-            if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
+            } else if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
                 SubserverSystem.sendPlayer(subserver, player);
             } else {
                 SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());