diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
index a9b8e37b..e2c1176a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
@@ -50,6 +50,7 @@ public class TypeMappers {
             @Override
             public ArenaMode map(Chatter sender, PreviousArguments previousArguments, String s) {
                 ArenaMode arenaMode = ArenaMode.getByChat(s);
+                if (arenaMode == null) return null;
                 if (arenaMode.isHistoric() != historic) return null;
                 if (!arenaMode.isActive()) return null;
                 return arenaMode;