Index: java/common/javax/swing/plaf/basic/BasicComboBoxUI.java =================================================================== --- java/common/javax/swing/plaf/basic/BasicComboBoxUI.java (revision 453197) +++ java/common/javax/swing/plaf/basic/BasicComboBoxUI.java (working copy) @@ -369,9 +369,11 @@ } public void removeEditor() { - comboBox.remove(editor); - unconfigureEditor(); - editor = null; + if (editor != null){ + comboBox.remove(editor); + unconfigureEditor(); + editor = null; + } } public boolean isPopupVisible(final JComboBox c) {