diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java
index fa91cf18f1..e9915a3b73 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java
@@ -59,7 +59,9 @@ public class ObjectNode extends GTreeSlowLoadingNode {  //extends GTreeNode
 	public void setContainer(ObjectTree tree, ObjectContainer parent, ObjectContainer container) {
 		this.container = container;
 		name = container.getName();
-		tree.addToMap(parent, container, this);
+		if (parent != null) {
+			tree.addToMap(parent, container, this);
+		}
 		//fireNodeStructureChanged(this);
 	}
 
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java
index 068652f921..f0043d763d 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java
@@ -68,6 +68,7 @@ public class ObjectTree implements ObjectPane {
 
 	public ObjectTree(ObjectContainer container) {
 		this.root = new ObjectNode(this, null, container);
+		addToMap(null, container, root);
 		this.tree = new GTree(root);
 
 		this.listingService = container.getProvider().getListingService();