diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
index 7edad1ddc1e3..3bda0d59f263 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
@@ -116,7 +116,9 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change
 
         myModuleModel.dispose();
 
-        myFacetsConfigurator.disposeEditors();
+        if (myFacetsConfigurator != null) {
+          myFacetsConfigurator.disposeEditors();
+        }
       }
     });