diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewSymbolTable.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewSymbolTable.java
index 3cab78d479..71fe609e2e 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewSymbolTable.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewSymbolTable.java
@@ -74,6 +74,9 @@ public class DBTraceProgramViewSymbolTable implements SymbolTable {
 	}
 
 	protected TraceNamespaceSymbol assertTraceNamespace(Namespace ns) {
+		if (ns == null) {
+			return symbolManager.getGlobalNamespace();
+		}
 		if (!(ns instanceof TraceNamespaceSymbol)) {
 			throw new IllegalArgumentException("Given namespace is not part of this trace");
 		}