diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 87e2bf92..48a40870 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -61,6 +61,8 @@ public class ArenaMode {
             }
             if (gameModeConfig.Schematic.loaded && gameModeConfig.Schematic.Type != SchematicType.Normal) {
                 bySchemType.put(gameModeConfig.Schematic.Type, gameModeConfig);
+                SchematicType checkType = gameModeConfig.Schematic.Type.checkType();
+                if (checkType != null) bySchemType.put(checkType, gameModeConfig);
             }
         }
     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 2d9f4df8..589fa0c5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -100,6 +100,7 @@ public class CheckCommand extends SWCommand {
 
         for (SchematicNode schematic : schematicList) {
             GameModeConfig<String, String> gameModeConfig = ArenaMode.getBySchemType(schematic.getSchemtype());
+            if (gameModeConfig == null) gameModeConfig = GameModeConfig.getDefaults();
             CheckSession current = currentSchems.get(schematic.getId());
             ClickEvent clickEvent = null;
             Message hoverMessage = null;