diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
index f2aaa1f83876..d2294c03b55c 100644
--- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
@@ -221,7 +221,12 @@ public abstract class DiffRequestProcessor implements Disposable {
     DiffViewer viewer = frameTool.createComponent(myContext, myActiveRequest);
 
     for (DiffExtension extension : DiffExtension.EP_NAME.getExtensions()) {
-      extension.onViewerCreated(viewer, myContext, myActiveRequest);
+      try {
+        extension.onViewerCreated(viewer, myContext, myActiveRequest);
+      }
+      catch (Throwable e) {
+        LOG.error(e);
+      }
     }
 
     DiffViewerWrapper wrapper = myActiveRequest.getUserData(DiffViewerWrapper.KEY);