diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
index 106f1c49ea54..532704de52bd 100644
--- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
@@ -120,7 +120,7 @@ public class RemoteConfigurable extends SettingsEditor<RemoteConfiguration> {
     boolean selected = false;
     for (JDKVersionItem value : JDKVersionItem.values()) {
       myJDKVersion.addItem(value);
-      if (!selected && version.isAtLeast(value.myVersion)) {
+      if (!selected && version != null && version.isAtLeast(value.myVersion)) {
         myJDKVersion.setSelectedItem(value);
         selected = true;
       }