1 files changed, 2 insertions, 2 deletions
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 83c3cd3b34..a229e21c09 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
@@ -87,7 +87,7 @@ public final class CommandEnvironment {
       EventBus eventBus) {
     this.runtime = runtime;
     this.commandId = commandId;
-    this.reporter = reporter;
+    this.reporter = reporter == null ? new Reporter() : reporter;
     this.eventBus = eventBus;
     this.blazeModuleEnvironment = new BlazeModuleEnvironment();
     this.view = new BuildView(runtime.getDirectories(), runtime.getRuleClassProvider(),
@@ -226,7 +226,7 @@ public final class CommandEnvironment {
    */
   public void setupPackageCache(PackageCacheOptions packageCacheOptions,
       String defaultsPackageContents) throws InterruptedException, AbruptExitException {
-    runtime.setupPackageCache(packageCacheOptions, defaultsPackageContents, commandId);
+    runtime.setupPackageCache(reporter, packageCacheOptions, defaultsPackageContents, commandId);
   }
 
   public long getCommandStartTime() {