diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
index 5ba0655e2169..103dc784644b 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
@@ -87,7 +87,7 @@ public class MoveJavaClassHandler implements MoveClassHandler {
     newClass.getContainingFile().accept(new JavaRecursiveElementVisitor() {
       @Override
       public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
-        if (reference.isReferenceTo(oldClass)) {
+        if (reference.isValid() && reference.isReferenceTo(oldClass)) {
           final PsiImportStatementBase importStatement = PsiTreeUtil.getParentOfType(reference, PsiImportStatementBase.class);
           if (importStatement != null) {
             importsToDelete.add(importStatement);