diff --git a/platform/lvcs-api/src/com/intellij/history/LocalHistory.java b/platform/lvcs-api/src/com/intellij/history/LocalHistory.java
index f33664bd6566..6e95af88c5c6 100644
--- a/platform/lvcs-api/src/com/intellij/history/LocalHistory.java
+++ b/platform/lvcs-api/src/com/intellij/history/LocalHistory.java
@@ -39,6 +39,7 @@ public abstract class LocalHistory {
 
   public abstract Label putUserLabel(Project p, @NotNull String name);
 
+  @Nullable
   public abstract byte[] getByteContent(VirtualFile f, FileRevisionTimestampComparator c);
 
   public abstract boolean isUnderControl(VirtualFile f);
diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryImpl.java b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryImpl.java
index c183abe00940..aa6196b17c7f 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryImpl.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryImpl.java
@@ -123,6 +123,9 @@ public class LocalHistoryImpl extends LocalHistory implements ApplicationCompone
     fm.removeVirtualFileManagerListener(myEventDispatcher);
     CommandProcessor.getInstance().removeCommandListener(myEventDispatcher);
 
+
+    validateStorage();
+    LocalHistoryLog.LOG.info("Purging local history...");
     myChangeList.purgeObsolete(period);
     validateStorage();
 
@@ -178,6 +181,7 @@ public class LocalHistoryImpl extends LocalHistory implements ApplicationCompone
     };
   }
 
+  @Nullable
   @Override
   public byte[] getByteContent(final VirtualFile f, final FileRevisionTimestampComparator c) {
     if (!isInitialized()) return null;