2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index aa96cee68a..3ab483ad84 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -485,6 +485,9 @@ public class BlazeCommandDispatcher {
         reporter.handle(Event.error(e.getMessage()));
         return e.getExitCode().getNumericExitCode();
       }
+      for (BlazeModule module : runtime.getBlazeModules()) {
+        module.handleOptions(optionsParser);
+      }
 
       // Print warnings for odd options usage
       for (String warning : optionsParser.getWarnings()) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 9786f0f1e7..1ace4adb91 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -515,9 +515,6 @@ public final class CommandEnvironment {
         throw new IllegalStateException(e);
       }
     }
-    for (BlazeModule module : runtime.getBlazeModules()) {
-      module.handleOptions(optionsParser);
-    }
 
     eventBus.post(new CommandStartEvent(
         command.name(), getCommandId(), getClientEnv(), workingDirectory, getDirectories(),