1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
index 15c9cf1f2..c8d9667df 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
@@ -151,7 +151,12 @@ public class RunToLineAction extends Action implements IUpdate {
 	public void dispose() {
 		IDebugContextManager manager = DebugUITools.getDebugContextManager();
 		if (fActivePart != null) {
-			manager.getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener);
+			IWorkbenchWindow ww = fActivePart.getSite().getWorkbenchWindow();
+			if (ww != null) {
+				manager.getContextService(ww).removeDebugContextListener(fContextListener);
+			} else {
+				manager.removeDebugContextListener(fContextListener);
+			}
 		}
 		fActivePart = null;
 		fTargetElement = null;