diff --git a/platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
index 87ee92694e0f..29b67f7694df 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
@@ -202,7 +202,7 @@ public class MapReduceIndex<Key, Value, Input> implements UpdatableIndex<Key,Val
     try {
       index.close();
     }
-    catch (IOException ignored) {
+    catch (Throwable ignored) {
     }
 
     IOUtil.deleteAllFilesStartingWith(baseFile);
diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
index ab1a59128a99..ac10e424db01 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
@@ -505,16 +505,19 @@ public class PersistentHashMapValueStorage {
   }
 
   public void dispose() {
-    if (myCompressedAppendableFile != null) myCompressedAppendableFile.dispose();
-    if (mySize < 0) assert false; // volatile read
-    ourReadersCache.remove(myPath);
-    ourAppendersCache.remove(myPath);
+    try {
+      if (myCompressedAppendableFile != null) myCompressedAppendableFile.dispose();
+    } finally {
+      if (mySize < 0) assert false; // volatile read
+      ourReadersCache.remove(myPath);
+      ourAppendersCache.remove(myPath);
 
-    ourRandomAccessFileCache.remove(myPath);
+      ourRandomAccessFileCache.remove(myPath);
 
-    if (myCompactionModeReader != null) {
-      myCompactionModeReader.dispose();
-      myCompactionModeReader = null;
+      if (myCompactionModeReader != null) {
+        myCompactionModeReader.dispose();
+        myCompactionModeReader = null;
+      }
     }
   }