diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java
index 5d5a4ab948..6de95a082e 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java
@@ -245,6 +245,9 @@ public class OrganizationNode extends SymbolTreeNode {
 	private void checkForTooManyNodes() {
 
 		SymbolTreeRootNode root = (SymbolTreeRootNode) getRoot();
+		if (root == null) {
+			return;
+		}
 		int reOrgLimit = root.getReorganizeLimit();
 		if (getChildCount() < reOrgLimit) {
 			return;