diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java index eb6ec8362833..2c422002712b 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java @@ -34,7 +34,8 @@ public class MoveJavaFileHandler extends MoveFileHandler { public List findUsages(PsiFile psiFile, PsiDirectory newParent, boolean searchInComments, boolean searchInNonJavaFiles) { final List result = new ArrayList(); - final String qualifiedName = JavaDirectoryService.getInstance().getPackage(newParent).getQualifiedName(); + final PsiPackage newParentPackage = JavaDirectoryService.getInstance().getPackage(newParent); + final String qualifiedName = newParentPackage == null ? "" : newParentPackage.getQualifiedName(); for (PsiClass aClass : ((PsiJavaFile)psiFile).getClasses()) { Collections.addAll(result, MoveClassesOrPackagesUtil.findUsages(aClass, searchInComments, searchInNonJavaFiles, StringUtil.getQualifiedName(qualifiedName, aClass.getName())));