From a0165f64f290fbe707e539ea3f5e9a0b2b1d25aa Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Fri, 5 Dec 2014 18:20:14 +0300
Subject: [PATCH] fixed EA-61979 - NPE: PyActiveSdkConfigurable$.consume

---
 .../python/configuration/PyActiveSdkConfigurable.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
index 09b0c73e54fb..34d24cd0a8e2 100644
--- a/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+++ b/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
@@ -116,7 +116,8 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
           PythonSdkAdditionalData additionalData = (PythonSdkAdditionalData)sdk.getSdkAdditionalData();
           if (additionalData != null) {
             final String path = additionalData.getAssociatedProjectPath();
-            if (!myProject.getBasePath().equals(path))
+            final String basePath = myProject.getBasePath();
+            if (basePath != null && !basePath.equals(path))
               additionalData.setAssociatedProjectPath(null);
           }
           updateSdkList(false);