diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
index 2d32622e38bf..0f494cd9e10b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
@@ -162,7 +162,8 @@ public class SvnHistoryProvider
           afterRevision.getFile().equals(path)) {
         committedPath = beforeRevision.getFile();
       }
-      if (peg == null && change.getBeforeRevision() != null) {
+      // revision can be VcsRevisionNumber.NULL
+      if (peg == null && change.getBeforeRevision() != null && change.getBeforeRevision().getRevisionNumber() instanceof SvnRevisionNumber) {
         peg = ((SvnRevisionNumber) change.getBeforeRevision().getRevisionNumber()).getRevision();
       }
     }