diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
index 2cb502ffbe4d..ff9a56ba1c68 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
@@ -247,13 +247,15 @@ public class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentState
       ApplicationManager.getApplication().runReadAction(new Runnable() {
         @Override
         public void run() {
+          if (myProject.isDisposed()) return;
           synchronized (myMonitor) {
             myMapping.copyFrom(mapping);
             myMoreRealMapping.copyFrom(groupedMapping);
           }
+          // all listeners are asynchronous
+          myProject.getMessageBus().syncPublisher(SvnVcs.ROOTS_RELOADED).run();
         }
       });
-      myProject.getMessageBus().syncPublisher(SvnVcs.ROOTS_RELOADED).run();
     }
   }