diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java index ba3d2df79d46..20fb50f51178 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -411,11 +411,15 @@ public class EclipseImportBuilder extends ProjectImportBuilder implement } public Parameters getParameters() { + return getParameters(getCurrentProject()); + } + + public Parameters getParameters(final Project project) { if (parameters == null) { parameters = new Parameters(); parameters.existingModuleNames = new HashSet(); - if (isUpdate()) { - for (Module module : ModuleManager.getInstance(getCurrentProject()).getModules()) { + if (isUpdate() && project != null) { + for (Module module : ModuleManager.getInstance(project).getModules()) { parameters.existingModuleNames.add(module.getName()); } }