diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java
index 0d7b0c06..f5ffc094 100644
--- a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java
+++ b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java
@@ -81,9 +81,12 @@ public CommodoreBukkitBrigadier(BukkitCommandHandler handler) {
     }
 
     public @NotNull ArgumentType<?> getArgumentType(@NotNull CommandParameter parameter) {
-        ArgumentType<?> type = argumentTypes.getFlexible(parameter.getType()).getArgumentType(parameter);
-        if (type != null)
-            return type;
+        ArgumentTypeResolver resolver = argumentTypes.getFlexible(parameter.getType());
+        if (resolver != null) {
+            ArgumentType<?> type = resolver.getArgumentType(parameter);
+            if (type != null)
+                return type;
+        }
         return StringArgumentType.string();
     }