diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
index e14173504618..1de742dbd55f 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
@@ -142,8 +142,8 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen
                                    DocCommentPolicy javaDocPolicy) throws IncorrectOperationException {
     aClass.getProject().getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
       .refactoringStarted(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createBeforeData(aClass, selectedMembers));
+    final PsiClass anInterface = JavaDirectoryService.getInstance().createInterface(targetDir, interfaceName);
     try {
-      PsiClass anInterface = JavaDirectoryService.getInstance().createInterface(targetDir, interfaceName);
       PsiJavaCodeReferenceElement ref = ExtractSuperClassUtil.createExtendingReference(anInterface, aClass, selectedMembers);
       final PsiReferenceList referenceList = aClass.isInterface() ? aClass.getExtendsList() : aClass.getImplementsList();
       assert referenceList != null;
@@ -154,7 +154,7 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen
     }
     finally {
       aClass.getProject().getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
-        .refactoringDone(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createAfterData(aClass));
+        .refactoringDone(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createAfterData(anInterface));
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
index 11815b222c82..8812398b4f75 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
@@ -70,8 +70,8 @@ public class ExtractSuperClassUtil {
     project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
       .refactoringStarted(REFACTORING_EXTRACT_SUPER_ID, createBeforeData(subclass, selectedMemberInfos));
 
+    final PsiClass superclass = JavaDirectoryService.getInstance().createClass(targetDirectory, superclassName);
     try {
-      PsiClass superclass = JavaDirectoryService.getInstance().createClass(targetDirectory, superclassName);
       final PsiModifierList superClassModifierList = superclass.getModifierList();
       assert superClassModifierList != null;
       superClassModifierList.setModifierProperty(PsiModifier.FINAL, false);
@@ -115,7 +115,7 @@ public class ExtractSuperClassUtil {
       return superclass;
     }
     finally {
-      project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC).refactoringDone(REFACTORING_EXTRACT_SUPER_ID, createAfterData(subclass));
+      project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC).refactoringDone(REFACTORING_EXTRACT_SUPER_ID, createAfterData(superclass));
     }
   }