diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index e6926da..1db2988 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -51,8 +51,9 @@ public abstract class SWCommand {
                 if (!initialized) {
                     createMapping();
                 }
-                if (commandList.stream().anyMatch(s -> s.invoke(sender, args))) return false;
-                commandHelpList.stream().anyMatch(s -> s.invoke(sender, args));
+                if (!commandList.stream().anyMatch(s -> s.invoke(sender, args))) {
+                    commandHelpList.stream().anyMatch(s -> s.invoke(sender, args));
+                }
                 return false;
             }
 
@@ -87,13 +88,13 @@ public abstract class SWCommand {
             add(Register.class, method, i -> i > 0, 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");
+                    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");
+                    Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking the varArgs parameters as last Argument");
                 }
                 if (parameters[parameters.length - 1].getType().getComponentType() != String.class) {
-                    Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking the varArgs parameters of type '" + String.class.getTypeName() + "' as last Argument");
+                    Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking the varArgs parameters of type '" + String.class.getTypeName() + "' as last Argument");
                     return;
                 }
                 commandHelpList.add(new SubCommand(this, method, anno.value(), new HashMap<>()));
@@ -114,7 +115,7 @@ public abstract class SWCommand {
                     }
                     String name = mapper != null ? mapper.value() : clazz.getTypeName();
                     if (!SWCommandUtils.MAPPER_FUNCTIONS.containsKey(name) && !localTypeMapper.containsKey(name)) {
-                        Bukkit.getLogger().log(Level.WARNING, "The parameter '" + parameter.toString() + "' is using an unsupported Mapper of type '" + name + "'");
+                        Bukkit.getLogger().log(Level.WARNING, () -> "The parameter '" + parameter.toString() + "' is using an unsupported Mapper of type '" + name + "'");
                         return;
                     }
                 }
@@ -141,15 +142,15 @@ public abstract class SWCommand {
 
         Parameter[] parameters = method.getParameters();
         if (!parameterTester.test(parameters.length)) {
-            Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking parameters or has too many");
+            Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking parameters or has too many");
             return;
         }
         if (firstParameter && !CommandSender.class.isAssignableFrom(parameters[0].getType())) {
-            Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking the first parameter of type '" + CommandSender.class.getTypeName() + "'");
+            Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking the first parameter of type '" + CommandSender.class.getTypeName() + "'");
             return;
         }
         if (returnType != null && method.getReturnType() != returnType) {
-            Bukkit.getLogger().log(Level.WARNING, "The method '" + method.toString() + "' is lacking the desired return type '" + returnType.getTypeName() + "'");
+            Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking the desired return type '" + returnType.getTypeName() + "'");
             return;
         }
         Arrays.stream(anno).forEach(t -> consumer.accept(t, parameters));