1 files changed, 4 insertions, 3 deletions
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
index 8a561e4003b4..61a5c71861c3 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
@@ -29,8 +29,9 @@ public class ModulesAlphaComparator implements Comparator<Module>{
 
   @Override
   public int compare(Module module1, Module module2) {
-    final String name1 = module1.getName();
-    final String name2 = module2.getName();
-    return name1.compareToIgnoreCase(name2);
+    if (module1 == null && module2 == null) return 0;
+    if (module1 == null && module2 != null) return -1;
+    if (module1 != null && module2 == null) return 1;
+    return module1.getName().compareToIgnoreCase(module2.getName());
   }
 }