diff --git a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java
index ca37cdb18f20..4a7fa538a669 100644
--- a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java
+++ b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java
@@ -146,11 +146,13 @@ public class TestStateStorage implements Disposable {
     if (myMap == null) return;
     try {
       myMap.close();
-      myMap = null;
     }
     catch (IOException e) {
       LOG.error(e);
     }
+    finally {
+      myMap = null;
+    }
   }
 
   private void thingsWentWrongLetsReinitialize(IOException e, String message) {