diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
index 6f3b22acbc57..08e166634201 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
@@ -166,9 +166,9 @@ public class GenericDebuggerParametersRunnerConfigurable extends SettingsEditor<
 
   public void applyEditorTo(GenericDebuggerRunnerSettings runnerSettings) throws ConfigurationException {
     runnerSettings.LOCAL = myIsLocal;
-    runnerSettings.setTransport(getTransport());
     checkPort();
     runnerSettings.setDebugPort(getPort());
+    runnerSettings.setTransport(getTransport());
   }
 
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
index 03129c9968c1..d6b193d8399b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
@@ -31,12 +31,6 @@ public class GenericDebuggerRunnerSettings implements JDOMExternalizable, Debugg
   public boolean LOCAL = true;
 
   public GenericDebuggerRunnerSettings() {
-    try {
-      DEBUG_PORT = DebuggerUtils.getInstance().findAvailableDebugAddress(DebuggerSettings.SOCKET_TRANSPORT == TRANSPORT);
-    }
-    catch (ExecutionException e) {
-      DEBUG_PORT = "";
-    }
   }
 
   public String getDebugPort() {