diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 33bd7bb..39a46c7 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -90,7 +90,8 @@ public class TpCommand extends BasicCommand {
             return false;
 
         // Check if player is allowed to join fights
-        if (Subserver.getSubserver(server).getType() == Servertype.ARENA) {
+        Subserver subserver = Subserver.getSubserver(server);
+        if (subserver != null && subserver.getType() == Servertype.ARENA) {
             SteamwarUser steamwarUser = SteamwarUser.get(player);
             if (steamwarUser.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer)) {
                 return true;