diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
index 05a59804171a..93a2277cc51d 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
@@ -819,7 +819,12 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec
     // Ensure all documents are committed on save so file content dependent indices, that use PSI to build have consistent content.
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       public void run() {
-        commitAllDocuments();
+        try {
+          commitAllDocuments();
+        }
+        catch (Exception e) {
+          LOG.error(e);
+        }
       }
     });
   }