diff --git a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
index 56a06fece67a..9e334bbe44c3 100644
--- a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
@@ -23,30 +23,24 @@ import org.jetbrains.annotations.Nullable;
 public class MoveToPackageFix extends LocalQuickFixAndIntentionActionOnPsiElement {
   private static final Logger LOG = Logger.getInstance(MoveToPackageFix.class);
   private final String myTargetPackage;
-  private final @Nullable SmartPsiElementPointer<@NotNull PsiClass> myClass;
+  private final @IntentionName String myText;
 
   public MoveToPackageFix(@NotNull PsiFile psiFile, @NotNull String targetPackage) {
     super(psiFile);
     myTargetPackage = targetPackage;
-    myClass = null;
+    myText = QuickFixBundle.message("move.class.to.package.text", myTargetPackage);
   }
 
   public MoveToPackageFix(@NotNull PsiClass aClass, @NotNull String targetPackage) {
     super(aClass.getContainingFile());
     myTargetPackage = targetPackage;
-    myClass = SmartPointerManager.getInstance(aClass.getProject()).createSmartPsiElementPointer(aClass);
+    myText = QuickFixBundle.message("move.class.0.to.package.text",
+                                    JavaElementKind.fromElement(aClass).object(), aClass.getName(), myTargetPackage);
   }
 
   @Override
   public @IntentionName @NotNull String getText() {
-    if (myClass != null) {
-      PsiClass aClass = myClass.getElement();
-      if (aClass != null) {
-        return QuickFixBundle.message("move.class.0.to.package.text",
-                                      JavaElementKind.fromElement(aClass).object(), aClass.getName(), myTargetPackage);
-      }
-    }
-    return QuickFixBundle.message("move.class.to.package.text", myTargetPackage);
+    return myText;
   }
 
   @Override