Index: src/main/java/common/javax/swing/LookAndFeel.java =================================================================== --- src/main/java/common/javax/swing/LookAndFeel.java (revision 490131) +++ src/main/java/common/javax/swing/LookAndFeel.java (working copy) @@ -157,7 +157,7 @@ } public static void uninstallBorder(final JComponent comp) { - if (Utilities.isUIResource(comp.getBorder())) { + if (comp != null && Utilities.isUIResource(comp.getBorder())) { comp.setBorder(null); } }