diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager.java
index 399c4efd7af4..07f020760f76 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager.java
@@ -81,7 +81,7 @@ public class CommittedChangesViewManager implements ChangesViewContentProvider {
     }, new Condition() {
       @Override
       public boolean value(Object o) {
-        return (! myProject.isOpen()) || myProject.isDisposed();
+        return (! myProject.isOpen()) || myProject.isDisposed() || myComponent == null;
       }
     });
   }