[341662] NPE on Run On Server creating a new server
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
index 52e267e..047b498 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -3213,7 +3213,9 @@
 				editorHelper.setDebugNeverSave();
 			}
 			
-			launch = launchConfig.launch(mode2, monitor); // , true); - causes workspace lock
+			if (launchConfig != null){
+				launch = launchConfig.launch(mode2, monitor); // , true); - causes workspace lock
+			}
 			
 			if (editorHelper != null){
 				editorHelper.setDebugOriginalValue();