Index: trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java	(revision 5861)
+++ trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java	(revision 5862)
@@ -5,4 +5,5 @@
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -12,4 +13,5 @@
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -68,5 +70,10 @@
         if (def != null && value != null && def instanceof JLabel) {
             ((JLabel)def).setText(getComponentText(value));
-            ((JLabel)def).setIcon(ImageProvider.get(value.getDisplayType()));
+            ImageIcon icon = ImageProvider.get(value.getDisplayType());
+            if (icon != null) {
+                ((JLabel)def).setIcon(icon);
+            } else {
+                Main.warn("Null icon for "+value.getDisplayType());
+            }
             ((JLabel)def).setToolTipText(getComponentToolTipText(value));
         }