1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/google/gct/testing/CloudResultsLoader.java b/src/com/google/gct/testing/CloudResultsLoader.java
index 8cdf4db..41b7f89 100644
--- a/src/com/google/gct/testing/CloudResultsLoader.java
+++ b/src/com/google/gct/testing/CloudResultsLoader.java
@@ -105,9 +105,14 @@ public class CloudResultsLoader {
     this.cloudProjectId = cloudProjectId;
     this.testRunListener = testRunListener;
     this.bucketName = bucketName;
-    testMatrixId = testMatrix.getTestMatrixId();
-    for (TestExecution testExecution : testMatrix.getTestExecutions()) {
-      allConfigurationInstances.add(getEncodedConfigurationNameForTestExecution(testExecution));
+    // testMatrix is null for runs with a fake bucket.
+    if (testMatrix != null) {
+      testMatrixId = testMatrix.getTestMatrixId();
+      for (TestExecution testExecution : testMatrix.getTestExecutions()) {
+        allConfigurationInstances.add(getEncodedConfigurationNameForTestExecution(testExecution));
+      }
+    } else {
+      testMatrixId = null;
     }
   }