diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 2de2e36e3e06..fe9c948b9ee7 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -643,10 +643,14 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumeratorDelegate<
       }
       finally {
         final PersistentHashMapValueStorage valueStorage = myValueStorage;
-        if (valueStorage != null) {
-          valueStorage.dispose();
+        try {
+          if (valueStorage != null) {
+            valueStorage.dispose();
+          }
+        }
+        finally {
+          super.close();
         }
-        super.close();
       }
     }
     finally {