diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java
index 900f30cdca..d92df16baa 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java
@@ -126,6 +126,9 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack {
 		else {
 			thread = manager.threadManager.getThread(threadSnap.threadKey);
 			frames.clear();
+			if (frameKeys == null) {
+				return;
+			}
 			for (long k : frameKeys) {
 				frames.add(manager.getFrameByKey(k));
 			}