Index: src/main/java/common/javax/swing/DebugGraphics.java =================================================================== --- src/main/java/common/javax/swing/DebugGraphics.java (revision 489013) +++ src/main/java/common/javax/swing/DebugGraphics.java (working copy) @@ -168,7 +168,7 @@ } public DebugGraphics(Graphics g, JComponent c) { - originalGraphics = g.create(); + originalGraphics = (g == null ? null : g.create()); component = c; thisNumber = debugGraphicsCount++; }