diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java
index 7577884..a33cb74 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java
@@ -309,7 +309,12 @@
 			return;
 		
 		if (acceleratorMenu == null || acceleratorMenu.isDisposed()) {		
-			Menu parent = workbenchWindow.getShell().getMenuBar();
+			Shell shell = workbenchWindow.getShell();
+			
+			if (shell == null || shell.isDisposed())
+				return;
+				
+			Menu parent = shell.getMenuBar();
 			
 			if (parent == null || parent.isDisposed() || parent.getItemCount() < 1)
 				return;