1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
index 3c559de383..4556c762fb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
@@ -116,6 +116,9 @@ final class TestsInSuiteFunction implements SkyFunction {
       if (TargetUtils.isTestSuiteRule(suite)) {
         TestsInSuiteValue value =
             (TestsInSuiteValue) env.getValue(TestsInSuiteValue.key(suite, strict));
+        if (value == null) {
+          continue;
+        }
         builder.merge(value.getTargets());
       }
     }