1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
index 04296df0a85..dd867f0dc55 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -91,7 +91,10 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
    */
   public void setItem(Object item)
   {
-    editor.setText(item.toString());
+     if (item == null)
+        editor.setText("");
+     else
+        editor.setText(item.toString());
   }
 
   /**