Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 14008)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 14009)
@@ -26,4 +26,5 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.DropMode;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
@@ -836,6 +837,7 @@
             fireTableDataChanged();
             int idx = getLayers().indexOf(layer);
-            if (layerList != null) {
-                layerList.setRowHeight(idx, Math.max(16, layer.getIcon().getIconHeight()));
+            Icon icon = layer.getIcon();
+            if (layerList != null && icon != null) {
+                layerList.setRowHeight(idx, Math.max(16, icon.getIconHeight()));
             }
             selectionModel.setSelectionInterval(idx, idx);