From 6234320b6c9f4b9df0240ac717d12d1cc038f1ab Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 9 Jan 2012 19:36:46 +0100
Subject: [PATCH] NPE

---
 .../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 34560c28625d..9293804d0565 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
@@ -105,7 +105,7 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton
                             int index,
                             boolean selected,
                             boolean hasFocus) {
-        if (itemWrapper != NULL_WRAPPER) {
+        if (itemWrapper != NULL_WRAPPER && itemWrapper != null) {
           setIcon(itemWrapper.getIcon(fileIndex));
 
           setText(getPresentableText(itemWrapper, project));