diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
index e005e53e3432..b74a11ddead2 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
@@ -298,7 +298,7 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G
       DumbService.getInstance(myProject).showDumbModeNotification("Usage search is not available until indices are ready");
       throw new ProcessCanceledException();
     }
-    catch (Exception e) {
+    catch (Throwable e) {
       LOG.error(e);
     }
     finally {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
index e6f70f2331be..2b68e196ff36 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
@@ -195,7 +195,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp
                     InspectionToolPresentation presentation = getPresentation(toolWrapper);
                     presentation.exportResults(element, refEntity);
                   }
-                  catch (Exception e) {
+                  catch (Throwable e) {
                     LOG.error("Problem when exporting: " + refEntity.getExternalName(), e);
                   }
                 }
@@ -370,10 +370,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp
         catch (IndexNotReadyException e) {
           throw e;
         }
-        catch (Exception e) {
-          LOG.error("In file: " + file, e);
-        }
-        catch (AssertionError e) {
+        catch (Throwable e) {
           LOG.error("In file: " + file, e);
         }
         finally {
@@ -412,7 +409,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp
         catch (IndexNotReadyException e) {
           throw e;
         }
-        catch (Exception e) {
+        catch (Throwable e) {
           LOG.error(e);
         }
       }
@@ -427,7 +424,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp
       catch (IndexNotReadyException e) {
         throw e;
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         LOG.error(e);
       }
     }