From 8532684d063d56f6768ce843caaf69dd0217d822 Mon Sep 17 00:00:00 2001
From: Olesya Smirnova <Olesya.Smirnova@jetbrains.com>
Date: Wed, 2 Feb 2005 20:26:57 +0300
Subject: [PATCH] Exception fixed

---
 source/com/intellij/openapi/vcs/actions/VcsActionGroup.java | 3 +++
 source/com/intellij/openapi/wm/impl/IdeFrame.java           | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/com/intellij/openapi/vcs/actions/VcsActionGroup.java b/source/com/intellij/openapi/vcs/actions/VcsActionGroup.java
index 15ef1231660a..3c9f107c03a6 100644
--- a/source/com/intellij/openapi/vcs/actions/VcsActionGroup.java
+++ b/source/com/intellij/openapi/vcs/actions/VcsActionGroup.java
@@ -20,6 +20,9 @@ public class VcsActionGroup extends DefaultActionGroup {
     if (project == null){
       presentation.setVisible(false);
       presentation.setEnabled(false);
+    } else if (!project.isOpen()) {
+      presentation.setVisible(false);
+      presentation.setEnabled(false);
     } else if (ProjectLevelVcsManager.getInstance(project).getAllActiveVcss().length == 0){
       presentation.setVisible(false);
       presentation.setEnabled(false);
diff --git a/source/com/intellij/openapi/wm/impl/IdeFrame.java b/source/com/intellij/openapi/wm/impl/IdeFrame.java
index 2500266cec5d..b31f20a53326 100644
--- a/source/com/intellij/openapi/wm/impl/IdeFrame.java
+++ b/source/com/intellij/openapi/wm/impl/IdeFrame.java
@@ -151,7 +151,9 @@ public class IdeFrame extends JFrame implements DataProvider {
 
   public Object getData(final String dataId) {
     if (DataConstants.PROJECT.equals(dataId)) {
-      return myProject;
+      if (myProject != null) {
+        return myProject.isInitialized() ? myProject : null;
+      }
     }
     return null;
   }