diff --git a/source/com/intellij/ide/actions/SelectInContextImpl.java b/source/com/intellij/ide/actions/SelectInContextImpl.java
index 5b66031bb8df..c0f2e3386efc 100644
--- a/source/com/intellij/ide/actions/SelectInContextImpl.java
+++ b/source/com/intellij/ide/actions/SelectInContextImpl.java
@@ -69,7 +69,11 @@ abstract class SelectInContextImpl implements SelectInContext {
       selectInContext = OpenFileDescriptorContext.create(project, ((OpenFileDescriptor)descriptor).getFile());
     }
 
-    return new SelectInContextProvider(selectInContext, popupLocation);
+    if (selectInContext == null) {
+      return null;
+    } else {
+      return new SelectInContextProvider(selectInContext, popupLocation);
+    }
   }
 
   private static SelectInContextProvider createEditorContext(DataContext dataContext) {
diff --git a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 60aefdb978ce..3fec81586274 100644
--- a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -371,10 +371,15 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
     UpToDateRevisionProvider upToDateRevisionProvider = activeVcs.getUpToDateRevisionProvider();
     if (upToDateRevisionProvider == null) return;
 
-    String lastUpToDateContent = upToDateRevisionProvider.getLastUpToDateContentFor(virtualFile);
-    if (lastUpToDateContent == null) return;
+    try {
+      String lastUpToDateContent = upToDateRevisionProvider.getLastUpToDateContentFor(virtualFile);
+      if (lastUpToDateContent == null) return;
 
-    setUpToDateContent(document, lastUpToDateContent);
+      setUpToDateContent(document, lastUpToDateContent);
+    }
+    catch (VcsException e) {
+      //ignore
+    }
   }
 
   public boolean checkVcsIsActive(AbstractVcs vcs) {