diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
index 4a8652cb573a..d4c98221a567 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
@@ -55,10 +55,12 @@ public class SvnScopeZipper implements Runnable {
           }
         }
       }
-      final FilePath parent = file.getParentPath();
-      if (parent != null) {
-        final MyDirNonRecursive item = createOrGet(parent);
-        item.add(file);
+      else {
+        final FilePath parent = file.getParentPath();
+        if (parent != null) {
+          final MyDirNonRecursive item = createOrGet(parent);
+          item.add(file);
+        }
       }
     }
   }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
index b4e788c75260..42bc3890e1d0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
@@ -145,6 +145,7 @@ public abstract class AbstractSvnUpdateIntegrateEnvironment implements UpdateEnv
     }
 
     public void onRefreshFilesCompleted() {
+      // TODO: why do we need to mark all roots as dirty here???
       dirtyRoots();
 
       for (Runnable groupWorker : myGroupWorkers) {