Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 3856)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 3857)
@@ -49,4 +49,5 @@
     /**
      * see http://en.wikipedia.org/wiki/Cohen-Sutherland
+     * @return true, if line is visible in the given clip region
      */
     private boolean cohenSutherland( long x1, long y1, long x2, long y2, long xmin, long ymin, long xmax, long ymax)
Index: /trunk/src/org/openstreetmap/josm/tools/ColorHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ColorHelper.java	(revision 3856)
+++ /trunk/src/org/openstreetmap/josm/tools/ColorHelper.java	(revision 3857)
@@ -31,4 +31,6 @@
 
     public static String color2html(Color col) {
+        if (col == null)
+            return null;
         return "#"+int2hex(col.getRed())+int2hex(col.getGreen())+int2hex(col.getBlue());
     }