1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index ac27ee0446..949e25e32c 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -1127,7 +1127,11 @@ public final class ParallelEvaluator implements Evaluator {
         // always the case in a keepGoing evaluation, since it is assumed that done nodes do not
         // need to be traversed. In this case, we hope the caller is tolerant of a possibly empty
         // result, and return prematurely.
-        bubbleErrorInfo = ImmutableMap.of(errorKey, graph.get(errorKey).getValueWithMetadata());
+        bubbleErrorInfo =
+            ImmutableMap.of(
+                errorKey,
+                ValueWithMetadata.wrapWithMetadata(
+                    graph.get(errorKey).getValueMaybeWithMetadata()));
       }
     }
 
@@ -1649,7 +1653,9 @@ public final class ParallelEvaluator implements Evaluator {
           "Value cannot have error before evaluation started", key, value);
       return ValueWithMetadata.wrapWithMetadata(value);
     }
-    return isDoneForBuild(entry) ? entry.getValueWithMetadata() : null;
+    return isDoneForBuild(entry)
+        ? ValueWithMetadata.wrapWithMetadata(entry.getValueMaybeWithMetadata())
+        : null;
   }
 
   @Nullable