diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
index 919b02333c8b..9b9936443f78 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
@@ -179,7 +179,8 @@ public class ChangeListWorker {
   }
 
   @NotNull
-  private ListData getMainList(@NotNull PartialChangeTracker oldTracker) {
+  private ListData getMainList(@Nullable PartialChangeTracker oldTracker) {
+    if (oldTracker == null) return myDefault;
     List<String> changelistIds = oldTracker.getAffectedChangeListsIds();
     if (changelistIds.size() == 1) {
       ListData list = getDataByIdVerify(changelistIds.get(0));