diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
index 512a95e891bf..8754e23517fe 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
@@ -166,7 +166,7 @@ public class RollbackAction extends AnAction implements DumbAware {
   @Nullable
   private static List<Change> getChanges(final Project project, final AnActionEvent e) {
     final ChangesCheckHelper helper = new ChangesCheckHelper(project, e);
-    if (helper.isChangesSet()) return CollectionFactory.arrayList(helper.getChanges());
+    if (helper.isChangesSet() && helper.getChanges() != null) return CollectionFactory.arrayList(helper.getChanges());
 
     final VirtualFile[] virtualFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY);
     if (virtualFiles != null && virtualFiles.length > 0) {