diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
index 593b90d7889b..e67922709be5 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/IndexDataGetter.java
@@ -175,15 +175,19 @@ public class IndexDataGetter {
 
     @NotNull
     public Set<FilePath> getAffectedPaths(int commit) {
+      Set<FilePath> result = new SmartHashSet<>();
+
       Set<FilePath> paths = myCommitsToPaths.get(commit);
-      if (paths != null) return paths;
+      if (paths != null) result.addAll(paths);
 
       Set<UnorderedPair<FilePath>> renames = myCommitsToRenames.get(commit);
-      Set<FilePath> result = new SmartHashSet<>();
-      for (UnorderedPair<FilePath> rename : renames) {
-        result.add(rename.first);
-        result.add(rename.second);
+      if (renames != null) {
+        for (UnorderedPair<FilePath> rename : renames) {
+          result.add(rename.first);
+          result.add(rename.second);
+        }
       }
+
       return result;
     }
   }