diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
index a66f6de4a6c1..6316b85c1b96 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
@@ -37,6 +37,9 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
     IdeView view = e.getData(LangDataKeys.IDE_VIEW);
     Project project = e.getData(PlatformDataKeys.PROJECT);
 
+    if (view == null) {
+      return;
+    }
     PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
 
     if (directory == null) return;
@@ -51,7 +54,7 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
                                       Messages.getQuestionIcon(), "", validator);
 
     final PsiElement result = validator.getCreatedElement();
-    if (result != null && view != null) {
+    if (result != null) {
       view.selectElement(result);
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserUtil.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserUtil.java
index cf8d9c23e681..ada4ce149e56 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserUtil.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserUtil.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.refactoring.RefactoringBundle;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -34,7 +35,7 @@ public class DirectoryChooserUtil {
   }
 
   @Nullable
-  public static PsiDirectory getOrChooseDirectory(IdeView view) {
+  public static PsiDirectory getOrChooseDirectory(@NotNull IdeView view) {
     PsiDirectory[] dirs = view.getDirectories();
     if (dirs.length == 0) return null;
     if (dirs.length == 1) {