From d6f7a7ca87c1b31be028d9b0eb4398904551b457 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 2 Mar 2018 15:44:33 +0300
Subject: [PATCH] EA-117419 - NPE: RemoteConfigurable.<init>

---
 .../src/com/intellij/execution/remote/RemoteConfigurable.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
       }