Index: src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java
===================================================================
--- src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java	(revision 29262)
+++ src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java	(working copy)
@@ -104,6 +104,7 @@
 		if (jbws != null) {
 			this.tempJbws.setUserConfigClasspath(jbws.isUserConfigClasspath());
 			this.tempJbws.getLibraries().addAll(jbws.getLibraries());
+			this.tempJbws.setVersion(jbws.getVersion());
 		}
 
 	}
Index: src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java
===================================================================
--- src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java	(revision 29262)
+++ src/org/jboss/tools/ws/ui/preferences/JBossWSRuntimeListFieldEditor.java	(working copy)
@@ -466,12 +466,17 @@
 			name.addPropertyChangeListener(this);
 			version.doFillIntoGrid(root);
 			version.addPropertyChangeListener(this);
-			version.setValue(getWSFacetVersions().get(1));
+			if (current != null)
+				version.setValue(current.getVersion());
+			else
+				version.setValue(getWSFacetVersions().get(1));
 			homeDir.doFillIntoGrid(root);
 			homeDir.addPropertyChangeListener(this);
 
 			jars = new JBossWSLibraryListFieldEditor("", "", current); //$NON-NLS-1$ //$NON-NLS-2$
 			jars.doFillIntoGrid(root);
+			
+			
 			jars.addPropertyChangeListener(this);
 			setPageComplete(false);
 			setControl(root);
@@ -525,26 +530,28 @@
 				}
 			}
 
-			JBossWSRuntime jarJbws = (JBossWSRuntime) jars.getValue();
-			if (current != null
-					&& current.getName().equals(name.getValueAsString())
-					&& current.getHomeDir().equals(homeDir.getValueAsString())
-					&& current.getVersion().equals(version.getValueAsString())
-					&& current.isUserConfigClasspath() == jarJbws
-							.isUserConfigClasspath()
-					&& (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
-							current.getLibraries(), jarJbws.getLibraries()))) {
-
-				setErrorMessage(null);
-				setPageComplete(false);
-				return;
-			}
-
-			if (jarJbws.isUserConfigClasspath()
-					&& jarJbws.getLibraries().size() == 0) {
-				setErrorMessage(JBossWSUIMessages.JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar);
-				setPageComplete(false);
-				return;
+			if (jars != null) {
+				JBossWSRuntime jarJbws = (JBossWSRuntime) jars.getValue();
+				if (current != null
+						&& current.getName().equals(name.getValueAsString())
+						&& current.getHomeDir().equals(homeDir.getValueAsString())
+						&& current.getVersion().equals(version.getValueAsString())
+						&& current.isUserConfigClasspath() == jarJbws
+								.isUserConfigClasspath()
+						&& (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
+								current.getLibraries(), jarJbws.getLibraries()))) {
+	
+					setErrorMessage(null);
+					setPageComplete(false);
+					return;
+				}
+	
+				if (jarJbws.isUserConfigClasspath()
+						&& jarJbws.getLibraries().size() == 0) {
+					setErrorMessage(JBossWSUIMessages.JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar);
+					setPageComplete(false);
+					return;
+				}
 			}
 
 			if (homeDir.getValueAsString() == null