From 48ef5b7316f5f5b008dc99ce151931f3bcd47e94 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Wed, 20 Mar 2013 18:35:02 +0400
Subject: [PATCH] Fix NPE.

---
 .../maven/project/MavenProjectsManager.java    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
index ca49ab5187c1..6e57648089f4 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
@@ -989,10 +989,15 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent
 
     final Runnable r = new Runnable() {
       public void run() {
-        importer.set(
-          new MavenProjectImporter(myProject, myProjectsTree, getFileToModuleMapping(modelsProvider), projectsToImportWithChanges,
-                                   importModuleGroupsRequired, modelsProvider, getImportingSettings()));
-        postTasks.set(importer.get().importProject());
+        MavenProjectImporter projectImporter = new MavenProjectImporter(myProject,
+                                                                        myProjectsTree,
+                                                                        getFileToModuleMapping(modelsProvider),
+                                                                        projectsToImportWithChanges,
+                                                                        importModuleGroupsRequired,
+                                                                        modelsProvider,
+                                                                        getImportingSettings());
+        importer.set(projectImporter);
+        postTasks.set(projectImporter.importProject());
       }
     };
 
@@ -1024,7 +1029,10 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent
     // do not block user too often
     myImportingQueue.restartTimer();
 
-    return importer.get().getCreatedModules();
+    MavenProjectImporter projectImporter = importer.get();
+    if (projectImporter == null) return Collections.emptyList();
+
+    return projectImporter.getCreatedModules();
   }
 
   public void generateBuildConfiguration(boolean force) {