diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
index 04b90fa..e4e6c29 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java
@@ -182,14 +182,9 @@ public class SWCommandUtils {
     }
 
     private static Function<String, List<String>> numberCompleter(Function<String, ?> mapper) {
-        return s -> {
-            try {
-                mapper.apply(s);
-                return Collections.singletonList(s);
-            } catch (Exception e) {
-                return Collections.emptyList();
-            }
-        };
+        return s -> numberMapper(mapper).apply(s) != null
+                ? Collections.singletonList(s)
+                : Collections.emptyList();
     }
 
     static <T extends Annotation> T[] getAnnotation(Method method, Class<T> annotation) {
diff --git a/SpigotCore_Main/src/de/steamwar/command/SubCommand.java b/SpigotCore_Main/src/de/steamwar/command/SubCommand.java
index d53b4a6..15dad9a 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SubCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SubCommand.java
@@ -40,7 +40,7 @@ class SubCommand {
     private Function<CommandSender, ?> commandSenderFunction;
     Class<?> varArgType = null;
 
-    public SubCommand(SWCommand swCommand, Method method, String[] subCommand, Map<String, TypeMapper<?>> localTypeMapper) {
+    SubCommand(SWCommand swCommand, Method method, String[] subCommand, Map<String, TypeMapper<?>> localTypeMapper) {
         this.swCommand = swCommand;
         this.method = method;