1 files changed, 4 insertions, 2 deletions
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/TestSuiteModel.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/TestSuiteModel.java
index aeb8949a2c..08be4caeda 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/TestSuiteModel.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/TestSuiteModel.java
@@ -86,11 +86,13 @@ public class TestSuiteModel {
    * listener!
    */
   private TestCaseNode getTestCase(Description description) {
-    return testCaseMap.get(description);
+    // TODO(cpovirk): Is it legitimate to pass null here?
+    return description == null ? null : testCaseMap.get(description);
   }
 
   private TestNode getTest(Description description) {
-    return testsMap.get(description);
+    // TODO(cpovirk): Is it legitimate to pass null here?
+    return description == null ? null : testsMap.get(description);
   }
 
   // VisibleForTesting