1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
index 07b997785f..f40003b1a5 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
@@ -216,10 +216,12 @@ public class ActionCacheChecker {
       if (!key.equals(execPath)) {
         actionCache.remove(key);
       }
-      // Output files *must* exist and be accessible after successful action execution.
-      Metadata metadata = metadataHandler.getMetadata(output);
-      Preconditions.checkState(metadata != null);
-      entry.addFile(output.getExecPath(), metadata);
+      if (!metadataHandler.artifactOmitted(output)) {
+        // Output files *must* exist and be accessible after successful action execution.
+        Metadata metadata = metadataHandler.getMetadata(output);
+        Preconditions.checkState(metadata != null);
+        entry.addFile(output.getExecPath(), metadata);
+      }
     }
     for (Artifact input : action.getInputs()) {
       entry.addFile(input.getExecPath(), metadataHandler.getMetadataMaybe(input));