diff --git a/intake/src/main/java/com/sk89q/intake/parametric/AbstractParametricCallable.java b/intake/src/main/java/com/sk89q/intake/parametric/AbstractParametricCallable.java
index c197274..ae82669 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/AbstractParametricCallable.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/AbstractParametricCallable.java
@@ -165,6 +165,7 @@ public final boolean call(String stringArguments, Namespace namespace, List<Stri
         String[] split = CommandContext.split(calledCommand + " " + stringArguments);
         CommandContext context = new CommandContext(split, parser.getValueFlags(), false, namespace);
         final CommandArgs commandArgs = Arguments.viewOf(context);
+        namespace.put(CommandArgs.class, commandArgs);
         List<InvokeHandler> handlers = new ArrayList<InvokeHandler>();
 
         // Provide help if -? is specified
@@ -204,8 +205,6 @@ public final boolean call(String stringArguments, Namespace namespace, List<Stri
                 return true; // Abort early
             }
 
-            namespace.put(CommandArgs.class, commandArgs);
-
             // invoke
             try {
                 builder.getCommandExecutor().submit(new Callable<Object>() {