diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 3aa9668..cc963a1 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -87,13 +87,16 @@ public abstract class SWCommand {
                     SWCommandUtils.addMapper(anno.value(), typeMapper);
                 }
             });
-            addMapper(ClassMapper.class, method, i -> i != 0, false, TypeMapper.class, (anno, typeMapper) -> {
+            addMapper(ClassMapper.class, method, i -> i == 0, false, TypeMapper.class, (anno, typeMapper) -> {
                 SWCommandUtils.addMapper(anno.value().getTypeName(), typeMapper);
             });
-            add(Register.class, method, i -> i == 2, true, null, (anno, parameters) -> {
+            add(Register.class, method, i -> i > 2, true, null, (anno, parameters) -> {
                 if (!anno.help()) {
                     return;
                 }
+                if (parameters.length != 2) {
+                    Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking parameters or has too many");
+                }
                 if (!parameters[parameters.length - 1].isVarArgs()) {
                     Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking the varArgs parameters as last Argument");
                     return;