diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java b/platform/lang-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
index 5a00463d818c..aca732f738ac 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
@@ -250,11 +250,15 @@ public abstract class ExtractSuperBaseDialog<ClassType extends PsiElement, Membe
 
     if (!checkConflicts()) return;
 
+    executeRefactoring();
+    setDocCommentPolicySetting(getDocCommentPolicy());
+    closeOKAction();
+  }
+
+  protected void executeRefactoring() {
     if (!isExtractSuperclass()) {
       invokeRefactoring(createProcessor());
     }
-    setDocCommentPolicySetting(getDocCommentPolicy());
-    closeOKAction();
   }
 
   @Override
@@ -267,7 +271,7 @@ public abstract class ExtractSuperBaseDialog<ClassType extends PsiElement, Membe
   }
 
   protected static class OperationFailedException extends Exception {
-    protected OperationFailedException(String message) {
+    public OperationFailedException(String message) {
       super(message);
     }
   }