diff --git a/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java b/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
index 8568e555c516..44ac8da33c4b 100644
--- a/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
+++ b/python/src/com/jetbrains/python/psi/impl/PythonLanguageLevelPusher.java
@@ -144,7 +144,7 @@ public class PythonLanguageLevelPusher implements FilePropertyPusher<LanguageLev
         }
       }
       myModuleSdks.put(module, newSdk);
-      if (!updatedSdks.contains(newSdk)) {
+      if (newSdk != null && !updatedSdks.contains(newSdk)) {
         updatedSdks.add(newSdk);
         updateSdkLanguageLevel(project, newSdk);
       }
@@ -156,7 +156,7 @@ public class PythonLanguageLevelPusher implements FilePropertyPusher<LanguageLev
 
   private void updateSdkLanguageLevel(Project project, Sdk sdk) {
     final LanguageLevel languageLevel = PythonSdkType.getLanguageLevelForSdk(sdk);
-    final VirtualFile[] files = sdk == null ? VirtualFile.EMPTY_ARRAY : sdk.getRootProvider().getFiles(OrderRootType.CLASSES);
+    final VirtualFile[] files = sdk.getRootProvider().getFiles(OrderRootType.CLASSES);
     for (VirtualFile file : files) {
       PushedFilePropertiesUpdater.findAndUpdateValue(project, file, this, languageLevel);
     }