diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveNode.java
index febf4ffeac..f0d90f614c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveNode.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveNode.java
@@ -78,8 +78,10 @@ public class ArchiveNode extends CategoryNode {
 			return; // some nodes do not have DataTypeManagers, like InvalidFileArchives
 		}
 
-		dataTypeManager.removeDataTypeManagerListener(listener);
-		listener.dispose();
+		if (listener != null) {
+			dataTypeManager.removeDataTypeManagerListener(listener);
+			listener.dispose();
+		}
 
 		dataTypeManager = archive.getDataTypeManager();
 		installDataTypeManagerListener();