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 6de95a082e..c56abe314b 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
@@ -141,6 +141,9 @@ public class OrganizationNode extends SymbolTreeNode {
 		if (this == o) {
 			return true;
 		}
+		if (o == null) {
+			return false;
+		}
 		if (getClass() != o.getClass()) {
 			return false;
 		}