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));