diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
index 5e6d10553e..383dd74469 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
@@ -674,6 +674,9 @@ public IApiComponent getApiComponent(String id, Version version) {
 			return component;
 		}
 		Set<IApiComponent> allComponents = fAllComponentsById.get(id);
+		if (allComponents == null) {
+			return null;
+		}
 		return allComponents.stream().filter(c -> hasSameMMMVersion(version, c)).findFirst().orElse(null);
 	}