diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index d2d66a0421bb..5a985cceabf7 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -215,8 +215,12 @@ public class PagedFileStorage implements Forceable {
   }
 
   public void close() {
-    force();
-    unmapAll();
+    try {
+      force();
+    }
+    finally {
+      unmapAll();
+    }
   }
 
   private void unmapAll() {