diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
index 764ada8ed5..77341dc371 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
@@ -2236,7 +2236,11 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
 
 				component.removeHierarchyListener(this);
 				DockingWindowManager dwm = getInstance(component);
-				ComponentProvider provider = dwm.getComponentProvider(component);
+				ComponentProvider provider = null;
+				if (dwm != null) {
+					provider = dwm.getComponentProvider(component);
+				}
+
 				listener.componentLoaded(dwm, provider);
 			}
 		});