diff --git a/java/idea-ui/src/com/intellij/ide/actions/ImportModuleAction.java b/java/idea-ui/src/com/intellij/ide/actions/ImportModuleAction.java
index 40206ba56b1e..ed56c863b510 100644
--- a/java/idea-ui/src/com/intellij/ide/actions/ImportModuleAction.java
+++ b/java/idea-ui/src/com/intellij/ide/actions/ImportModuleAction.java
@@ -177,7 +177,7 @@ public class ImportModuleAction extends AnAction {
   @Nullable
   public static AddModuleWizard createImportWizard(@Nullable final Project project,
                                                    @Nullable Component dialogParent,
-                                                   final VirtualFile file,
+                                                   @NotNull final VirtualFile file,
                                                    ProjectImportProvider... providers) {
     List<ProjectImportProvider> available = ContainerUtil.filter(providers, new Condition<ProjectImportProvider>() {
       @Override
diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleImportProvider.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleImportProvider.java
index df5ab08f62ae..dc6908518748 100644
--- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleImportProvider.java
+++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleImportProvider.java
@@ -18,6 +18,7 @@ package com.intellij.ide.util.projectWizard;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.projectImport.ProjectImportProvider;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -31,7 +32,7 @@ public class ModuleImportProvider extends ProjectImportProvider {
   }
 
   @Override
-  public boolean canImport(VirtualFile fileOrDirectory, Project project) {
+  public boolean canImport(@NotNull VirtualFile fileOrDirectory, Project project) {
     return project != null && !fileOrDirectory.isDirectory() && "iml".equals(fileOrDirectory.getExtension());
   }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/vcs/checkout/NewProjectCheckoutListener.java b/java/idea-ui/src/com/intellij/openapi/vcs/checkout/NewProjectCheckoutListener.java
index 2b739010070c..54959ac9fb9e 100644
--- a/java/idea-ui/src/com/intellij/openapi/vcs/checkout/NewProjectCheckoutListener.java
+++ b/java/idea-ui/src/com/intellij/openapi/vcs/checkout/NewProjectCheckoutListener.java
@@ -17,12 +17,14 @@ package com.intellij.openapi.vcs.checkout;
 
 import com.intellij.ide.actions.ImportModuleAction;
 import com.intellij.ide.util.newProjectWizard.AddModuleWizard;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.projectImport.ProjectImportProvider;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -31,14 +33,17 @@ import java.io.File;
  * Proposes to create a new project from the checked out sources.
  */
 public class NewProjectCheckoutListener implements CheckoutListener {
+  private static final Logger LOG = Logger.getInstance(NewProjectCheckoutListener.class);
+
   @Override
   public boolean processCheckedOutDirectory(Project project, File directory) {
+    VirtualFile file = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(directory);
+    LOG.assertTrue(file != null, "Can't find " + directory);
     int rc = Messages.showYesNoDialog(project, VcsBundle.message("checkout.create.project.prompt",
                                                                  ProjectCheckoutListener.getProductNameWithArticle(),
                                                                  directory.getAbsolutePath()),
                                       VcsBundle.message("checkout.title"), Messages.getQuestionIcon());
     if (rc == Messages.YES) {
-      VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(directory);
       AddModuleWizard wizard = createImportWizard(file);
       if (wizard == null) return false;
       if (wizard.showAndGet()) {
@@ -50,7 +55,7 @@ public class NewProjectCheckoutListener implements CheckoutListener {
   }
 
   @Nullable
-  protected AddModuleWizard createImportWizard(VirtualFile file) {
+  protected AddModuleWizard createImportWizard(@NotNull VirtualFile file) {
     return ImportModuleAction.createImportWizard(null, null, file, ProjectImportProvider.PROJECT_IMPORT_PROVIDER.getExtensions());
   }
 
diff --git a/java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java b/java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java
index cf9319d1428e..49d6f2c66e46 100644
--- a/java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java
+++ b/java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java
@@ -61,7 +61,7 @@ public abstract class ProjectImportProvider {
     return getBuilder().getIcon();
   }
 
-  public boolean canImport(VirtualFile fileOrDirectory, @Nullable Project project) {
+  public boolean canImport(@NotNull VirtualFile fileOrDirectory, @Nullable Project project) {
     if (fileOrDirectory.isDirectory()) {
       return true;
     }