1 files changed, 8 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
index 4c1de5e39551..3998a93d1b54 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
@@ -148,6 +148,11 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop
     }
   }
 
+  @Override
+  protected String getRefactoringId() {
+    return "refactoring.extractField";
+  }
+
   public void setVisibility(String visibility) {
     myIntroduceFieldPanel.setVisibility(visibility);
   }
@@ -203,6 +208,8 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop
 
     protected void performIntroduce() {
       ourLastInitializerPlace = myIntroduceFieldPanel.getInitializerPlace();
+      final PsiType forcedType = getType();
+      LOG.assertTrue(forcedType == null || forcedType.isValid(), forcedType);
       final BaseExpressionToFieldHandler.Settings settings =
         new BaseExpressionToFieldHandler.Settings(getInputName(),
                                                   getExpr(),
@@ -211,7 +218,7 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop
                                                   myIntroduceFieldPanel.isDeclareFinal(),
                                                   myIntroduceFieldPanel.getInitializerPlace(),
                                                   myIntroduceFieldPanel.getFieldVisibility(), (PsiLocalVariable)getLocalVariable(),
-                                                  getType(),
+                                                  forcedType,
                                                   myIntroduceFieldPanel.isDeleteVariable(),
                                                   myParentClass, false, false);
       new WriteCommandAction(myProject, getCommandName(), getCommandName()){