diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
index 05b56bb98a..955ccd6f5b 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
@@ -2227,6 +2227,9 @@ public class DefaultPdbApplicator implements PdbApplicator {
 
 	//==============================================================================================
 	void predefineClass(SymbolPath classPath) {
+		if (classPath == null) {
+			return;
+		}
 		isClassByNamespace.put(classPath, true);
 		for (SymbolPath path = classPath.getParent(); path != null; path = path.getParent()) {
 			if (!isClassByNamespace.containsKey(path)) {