diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
index 5b70d9185aad..572a5f5be1d3 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
@@ -55,7 +55,9 @@ public class RefsModel implements VcsLogRefs {
     TIntObjectHashMap<VirtualFile> map = new TIntObjectHashMap<VirtualFile>();
     for (Integer head : heads) {
       CommitId commitId = hashMap.getCommitId(head);
-      map.put(head, commitId.getRoot());
+      if (commitId != null) {
+        map.put(head, commitId.getRoot());
+      }
     }
     return map;
   }