diff --git a/src/main/java/net/minestom/server/command/builder/CommandDispatcher.java b/src/main/java/net/minestom/server/command/builder/CommandDispatcher.java
index 18805fdba..1ec7c4e45 100644
--- a/src/main/java/net/minestom/server/command/builder/CommandDispatcher.java
+++ b/src/main/java/net/minestom/server/command/builder/CommandDispatcher.java
@@ -31,7 +31,7 @@ public class CommandDispatcher {
         // Register aliases
         final String[] aliases = command.getAliases();
         if (aliases != null) {
-            for (String alias : command.getAliases()) {
+            for (String alias : aliases) {
                 this.commandMap.put(alias.toLowerCase(), command);
             }
         }
@@ -62,13 +62,14 @@ public class CommandDispatcher {
         final String[] parts = commandString.split(StringUtils.SPACE);
         final String commandName = parts[0];
 
-        final String[] args = commandString.replaceFirst(Pattern.quote(commandName), "").trim().split(StringUtils.SPACE);
-
         final Command command = findCommand(commandName);
         // Check if the command exists
         if (command == null)
             return null;
 
+        // Removes the command's name + the space after
+        final String[] args = commandString.replaceFirst(Pattern.quote(commandName), "").trim().split(StringUtils.SPACE);
+
         // Find the used syntax, or check which argument is wrong
         return findCommandResult(command, args);
     }
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
index 1d1d378eb..2f0e5b905 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentStringArray.java
@@ -20,7 +20,7 @@ public class ArgumentStringArray extends Argument<String[]> {
 
     @NotNull
     @Override
-    public String[] parse(@NotNull String input) throws ArgumentSyntaxException {
+    public String[] parse(@NotNull String input) {
         return input.split(Pattern.quote(StringUtils.SPACE));
     }
 
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
index 86e734e5b..49d1c94bf 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
@@ -1,6 +1,5 @@
 package net.minestom.server.command.builder.arguments;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandManager;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
 import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
index 1c27ff5e9..b7949c103 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentDouble.java
@@ -1,6 +1,5 @@
 package net.minestom.server.command.builder.arguments.number;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
 import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
index 36390c454..afd75bf95 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentFloat.java
@@ -1,6 +1,5 @@
 package net.minestom.server.command.builder.arguments.number;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
 import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
index 50b63e0c8..3cfaa3808 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentInteger.java
@@ -1,6 +1,5 @@
 package net.minestom.server.command.builder.arguments.number;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
 import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentLong.java b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentLong.java
index 84fd3de6e..a83cbc672 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentLong.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/number/ArgumentLong.java
@@ -1,6 +1,5 @@
 package net.minestom.server.command.builder.arguments.number;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
 import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
 import org.jetbrains.annotations.NotNull;