diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
index f4915144ad3a..982e1265eac0 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
@@ -180,6 +180,8 @@ public class PersistentHashMapValueStorage {
           }
         }
 
+        if (prevChunkAddress >= chunk) throw new PersistentEnumeratorBase.CorruptedException(myFile);
+
         chunk = prevChunkAddress;
         chunkCount++;
         if (result.length > mySize) {