From e8822476d763be72af6711f5d20f75e5a47767a8 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 19 Mar 2013 08:33:18 +0100
Subject: [PATCH] EA-44865 - NPE: DestinationFolderComboBox.selectDirectory
 (cherry picked from commit 3e5b60a3dd56199e780149e1f1a3f77507b8a085)

---
 .../move/moveClassesOrPackages/DestinationFolderComboBox.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
index 291a49df5b00..8ce4f9fd3e0c 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
@@ -167,7 +167,7 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton
     final PsiDirectory selectedPsiDirectory = selectedItem.getDirectory();
     VirtualFile selectedDestination = selectedPsiDirectory.getVirtualFile();
     if (showChooserWhenDefault &&
-        Comparing.equal(selectedDestination, myInitialTargetDirectory.getVirtualFile()) &&
+        myInitialTargetDirectory != null && Comparing.equal(selectedDestination, myInitialTargetDirectory.getVirtualFile()) &&
         mySourceRoots.length > 1) {
       selectedDestination = MoveClassesOrPackagesUtil.chooseSourceRoot(targetPackage, mySourceRoots, myInitialTargetDirectory);
     }