1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
index a6a251df0..c319e00bb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
@@ -118,6 +118,10 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
 		if (index >= 0) {
 			fProvidersByPartId.remove( getCombinedPartId(provider.getPart()) );
 			fProviders.remove(index);
+			if (fWindow != null && fWindow.isClosing()) {
+				provider.removeDebugContextListener(this);
+				return;
+			}
 			IDebugContextProvider activeProvider = getActiveProvider();
 			if (index == 0) {
     			if (activeProvider != null) {