### Eclipse Workspace Patch 1.0
#P org.jboss.ide.eclipse.as.ui
Index: jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java	(revision 43948)
+++ jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java	(working copy)
@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.IDecoratorManager;
 import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.wst.server.core.ServerCore;
@@ -94,7 +95,9 @@
 		ServerCore.removeServerLifecycleListener(selectionProvider);
 		UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
 		UnitedServerListenerManager.getDefault().removeListener(as7ScannerAssist);
-		JBossServerUISharedImages.instance().cleanup();
+		if (PlatformUI.isWorkbenchRunning()) {
+			JBossServerUISharedImages.instance().cleanup();
+		}
 		super.stop(context);
 	}
 
#P org.jboss.tools.runtime.ui
Index: src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
===================================================================
--- src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java	(revision 43948)
+++ src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java	(working copy)
@@ -12,6 +12,9 @@
 public class RuntimeWorkbenchUtils {
 	public static void refreshServersView() {
 		// https://jira.jboss.org/jira/browse/JBDS-1091
+		if (!PlatformUI.isWorkbenchRunning()) {
+			return;
+		}
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
 				IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");