### Eclipse Workspace Patch 1.0
#P org.eclipse.ui.workbench
Index: Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java,v
retrieving revision 1.31
diff -u -r1.31 EditorSashContainer.java
--- Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java	1 Oct 2009 09:57:57 -0000	1.31
+++ Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java	7 Apr 2010 15:23:28 -0000
@@ -14,7 +14,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
@@ -515,7 +514,10 @@
     public void updateTabList() {
         Composite parent = getParent();
         if (parent != null) { // parent may be null on startup
-            EditorStack wb = getActiveWorkbook();
+			EditorStack wb = null;
+			if (!getPage().getWorkbenchWindow().getWorkbench().isClosing()) {
+				wb = getActiveWorkbook();
+			}
             if (wb == null) {
                 parent.setTabList(new Control[0]);
             } else {