diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CompositeCheckoutListener.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CompositeCheckoutListener.java
index be3df7b04414..4f9d718512f7 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CompositeCheckoutListener.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CompositeCheckoutListener.java
@@ -60,10 +60,11 @@ public class CompositeCheckoutListener implements CheckoutProvider.Listener {
         result.set(vDir);
         if (vDir != null) {
           final LocalFileSystem.WatchRequest watchRequest = lfs.addRootToWatch(vDir.getPath(), true);
-          assert watchRequest != null;
           ((NewVirtualFile)vDir).markDirtyRecursively();
           vDir.refresh(false, true);
-          lfs.removeWatchedRoot(watchRequest);
+          if (watchRequest != null) {
+            lfs.removeWatchedRoot(watchRequest);
+          }
         }
       }
     });