From 5bb996437e608e3d24df16c55c85d2ccc6780e9f Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 24 Apr 2014 15:40:29 +0400
Subject: [PATCH] fixed possible NPE

---
 python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java  | 1 +
 .../python/newProject/PythonNewDirectoryProjectAction.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java b/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
index ed2163afd9bd..36946f33cfda 100644
--- a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
+++ b/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
@@ -80,6 +80,7 @@ public class PythonSdkChooserCombo extends ComboboxWithBrowseButton {
     PythonSdkDetailsStep.show(project, sdks, null, this, getButton().getLocationOnScreen(), new NullableConsumer<Sdk>() {
         @Override
         public void consume(@Nullable Sdk sdk) {
+          if(sdk == null) return;
           //noinspection unchecked
           getComboBox().setModel(new CollectionComboBoxModel(interpreterList.getAllPythonSdks(), sdk));
         }
diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
index dd5671b75622..a58fdd641dbf 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
@@ -86,7 +86,7 @@ public class PythonNewDirectoryProjectAction extends NewDirectoryProjectAction {
       for (Sdk sdk : sdks) {
         final SdkAdditionalData additionalData = sdk.getSdkAdditionalData();
         if (additionalData instanceof PythonSdkAdditionalData) {
-          ((PythonSdkAdditionalData) additionalData).reassociateWithCreatedProject(newProject);
+          ((PythonSdkAdditionalData)additionalData).reassociateWithCreatedProject(newProject);
         }
       }
     }