diff --git a/python/ide/src/com/jetbrains/python/configuration/PythonSdkOptions.java b/python/ide/src/com/jetbrains/python/configuration/PythonSdkOptions.java
index 0fd67b6ff402..762a77da56dd 100644
--- a/python/ide/src/com/jetbrains/python/configuration/PythonSdkOptions.java
+++ b/python/ide/src/com/jetbrains/python/configuration/PythonSdkOptions.java
@@ -455,7 +455,10 @@ public class PythonSdkOptions extends DialogWrapper {
       component.setPreferredSize(new Dimension(600, 400));
       component.setBorder(IdeBorderFactory.createBorder(SideBorder.ALL));
       dialog.setCenterPanel(component);
-      editor.reload(getSelectedSdk().getSdkModificator());
+      final Sdk sdk = getSelectedSdk();
+      if (sdk != null) {
+        editor.reload(sdk.getSdkModificator());
+      }
 
       dialog.setTitle("Interpreter Paths");
       dialog.show();