diff --git a/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
index 4eaf55438670..c2407044f8d4 100644
--- a/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
@@ -59,7 +59,7 @@ import java.util.List;
 import java.util.Set;
 
 public class PyActiveSdkConfigurable implements UnnamedConfigurable {
-  private final Project myProject;
+  @NotNull private final Project myProject;
   @Nullable private final Module myModule;
   private MySdkModelListener mySdkModelListener = new MySdkModelListener();
   private PyConfigurableInterpreterList myInterpreterList;
diff --git a/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
index 917d1a5c94c4..a66d97db6447 100644
--- a/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
+++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
@@ -350,7 +350,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
       additionalData = new PythonSdkAdditionalData(PythonSdkFlavor.getFlavor(modificator.getHomePath()));
       modificator.setSdkAdditionalData(additionalData);
     }
-    if (isAssociated) {
+    if (isAssociated && myProject != null) {
       additionalData.associateWithProject(myProject);
     }
     else {
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java b/python/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java
index 94a2eae129a1..31798a520ccc 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java
@@ -105,7 +105,7 @@ public class PythonSdkAdditionalData implements SdkAdditionalData {
     myAssociateWithNewProject = false;
   }
 
-  public void associateWithProject(Project project) {
+  public void associateWithProject(@NotNull Project project) {
     final String path = project.getBasePath();
     if (path != null) {
       myAssociatedProjectPath = FileUtil.toSystemIndependentName(path);
@@ -117,7 +117,7 @@ public class PythonSdkAdditionalData implements SdkAdditionalData {
     myAssociateWithNewProject = true;
   }
 
-  public void reassociateWithCreatedProject(Project project) {
+  public void reassociateWithCreatedProject(@NotNull Project project) {
     if (myAssociateWithNewProject) {
       associateWithProject(project);
     }
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java b/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
index a303ff7bacea..c0c3bbfccba8 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
@@ -192,7 +192,7 @@ public class PythonSdkDetailsStep extends BaseListPopupStep<String> {
             if (myNewProject) {
               ((PythonSdkAdditionalData)additionalData).associateWithNewProject();
             }
-            else {
+            else if (myProject != null) {
               ((PythonSdkAdditionalData)additionalData).associateWithProject(myProject);
             }
           }