diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
index 02781b67985f..ba29ba95d3f3 100644
--- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
+++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
@@ -106,7 +106,7 @@ public class SdkConfigurationUtil {
     return descriptor;
   }
 
-  public static void addSdk(final Sdk sdk) {
+  public static void addSdk(@NotNull final Sdk sdk) {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
@@ -213,7 +213,9 @@ public class SdkConfigurationUtil {
         });
         if (sdkHome != null) {
           final Sdk newSdk = setupSdk(ProjectJdkTable.getInstance().getAllJdks(), sdkHome, sdkType, true, null, null);
-          addSdk(newSdk);
+          if (newSdk != null) {
+            addSdk(newSdk);
+          }
           return newSdk;
         }
       }