diff --git a/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java b/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
index 5a59f068a9f5..b159667d6c82 100644
--- a/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
+++ b/source/com/intellij/ide/projectView/impl/nodes/BasePsiNode.java
@@ -107,6 +107,7 @@ public abstract class BasePsiNode <Type extends PsiElement> extends ProjectViewN
   }
 
   public boolean contains(VirtualFile file) {
+    if (getValue() == null) return false;
     PsiFile containingFile = getValue().getContainingFile();
     return containingFile.getVirtualFile().equals(file);
   }
diff --git a/source/com/intellij/openapi/vcs/actions/VcsContextWrapper.java b/source/com/intellij/openapi/vcs/actions/VcsContextWrapper.java
index d171e141ccd6..472219d9f3b0 100644
--- a/source/com/intellij/openapi/vcs/actions/VcsContextWrapper.java
+++ b/source/com/intellij/openapi/vcs/actions/VcsContextWrapper.java
@@ -155,7 +155,7 @@ public class VcsContextWrapper implements VcsContext {
     if (project == null) return null;
 
     ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(project);
-
+    if (toolWindowManager == null) return null;
     ToolWindowEx fileViewToolWindow =(ToolWindowEx) toolWindowManager.getToolWindow(ProjectLevelVcsManager.FILE_VIEW_TOOL_WINDOW_ID);
     final JComponent component = fileViewToolWindow.getComponent();
     return ((FileViewPanel) component);