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 96f0e1b34331..f1eb5191862e 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
     IdeView view = e.getData(LangDataKeys.IDE_VIEW);
     Project project = e.getData(PlatformDataKeys.PROJECT);
 
-    if (view == null) {
+    if (view == null || project == null) {
       return;
     }
     PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);