diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
index cb757f80140b..71cea9eb856d 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
@@ -85,13 +85,16 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
 
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
-        for (Pair<Editor, Project> each : toUpdate) {
-          final CodeFoldingManager foldingManager = CodeFoldingManager.getInstance(each.second);
-          if (foldingManager != null) {
-            foldingManager.buildInitialFoldings(each.first);
+          for (Pair<Editor, Project> each : toUpdate) {
+              if (each.second == null || each.second.isDisposed()) {
+                  continue;
+              }
+              final CodeFoldingManager foldingManager = CodeFoldingManager.getInstance(each.second);
+              if (foldingManager != null) {
+                  foldingManager.buildInitialFoldings(each.first);
+              }
           }
-        }
-        EditorOptionsPanel.reinitAllEditors();
+          EditorOptionsPanel.reinitAllEditors();
       }
     }, ModalityState.NON_MODAL);
   }