Index: trunk/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java	(revision 17114)
+++ trunk/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java	(revision 17119)
@@ -7,4 +7,7 @@
 import java.awt.Color;
 import java.util.Arrays;
+import java.util.Collections;
+
+import javax.swing.UIManager;
 
 import org.junit.Before;
@@ -43,4 +46,16 @@
     @Test
     public void testGet() {
+        assertEquals(Color.RED, base.get());
+
+        UIManager.put("JOSM.clr.general.test", Color.GRAY);
+        base = new NamedColorProperty("test", Color.RED);
+        assertEquals(Color.GRAY, base.get());
+
+        Config.getPref().putList("clr.general.test", Collections.singletonList("#123456"));
+        assertEquals(new Color(0x123456), base.get());
+
+        Config.getPref().putList("clr.general.test", null);
+        UIManager.put("JOSM.clr.general.test", null);
+        base = new NamedColorProperty("test", Color.RED);
         assertEquals(Color.RED, base.get());
     }