Index: src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java =================================================================== --- src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java (revision 490131) +++ src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java (working copy) @@ -671,6 +671,10 @@ } public String getApproveButtonToolTipText(final JFileChooser fc) { + if (fc == null) { + throw new NullPointerException(); + } + return approveButtonToolTipText; }