Index: src/main/java/common/javax/swing/plaf/basic/BasicSpinnerUI.java =================================================================== --- src/main/java/common/javax/swing/plaf/basic/BasicSpinnerUI.java (revision 499709) +++ src/main/java/common/javax/swing/plaf/basic/BasicSpinnerUI.java (working copy) @@ -308,7 +308,10 @@ } protected void replaceEditor(final JComponent oldEditor, final JComponent newEditor) { - spinner.remove(oldEditor); + if (oldEditor != null) { + spinner.remove(oldEditor); + } + editor = newEditor; if (!paintEditorBorder && editor instanceof DefaultEditor) { @@ -324,4 +327,4 @@ private void uninstallKeyboardActions() { BasicSpinnerKeyboardActions.uninstallKeyboardActions(spinner); } -} \ No newline at end of file +} Index: src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java =================================================================== --- src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java (revision 499709) +++ src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java (working copy) @@ -849,7 +849,12 @@ fileNameField.setText(fileToText(getFileChooser().getCurrentDirectory())); } } else if (JFileChooser.ACCESSORY_CHANGED_PROPERTY.equals(changedProperty)) { - getAccessoryPanel().remove((JComponent)event.getOldValue()); + final JComponent old = (JComponent) event.getOldValue(); + + if (old != null) { + getAccessoryPanel().remove(old); + } + getAccessoryPanel().add((JComponent)event.getNewValue()); } else if (StringConstants.TRANSFER_HANDLER_PROPERTY_NAME.equals(changedProperty)) { list.setTransferHandler((TransferHandler)event.getNewValue()); @@ -1533,4 +1538,4 @@ } } -} \ No newline at end of file +}