diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
index a2196e37234b..75b59f6b80be 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
@@ -186,6 +186,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
 
   @Override
   protected void performPsiSpoilingRefactoring() {
+    if (myNonCodeUsages == null) return; //refactoring was aborted
     RenameUtil.renameNonCodeUsages(myProject, myNonCodeUsages);
     if (myMoveCallback != null) {
       myMoveCallback.refactoringCompleted();