1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
index c153135c09..a084c3d200 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
@@ -271,6 +271,7 @@ class ArtifactFunction implements SkyFunction {
     return FileArtifactValue.createNormalFile(data);
   }
 
+  @Nullable
   private static AggregatingArtifactValue createAggregatingValue(
       Artifact artifact,
       ActionAnalysisMetadata action,
@@ -283,7 +284,9 @@ class ArtifactFunction implements SkyFunction {
         env.getValues(ArtifactSkyKey.mandatoryKeys(action.getInputs())).entrySet()) {
       Artifact input = ArtifactSkyKey.artifact(entry.getKey());
       SkyValue inputValue = entry.getValue();
-      Preconditions.checkNotNull(inputValue, "%s has null dep %s", artifact, input);
+      if (inputValue == null) {
+        return null;
+      }
       if (inputValue instanceof FileArtifactValue) {
         inputs.add(Pair.of(input, (FileArtifactValue) inputValue));
       } else if (inputValue instanceof TreeArtifactValue) {