Index: javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java,v
retrieving revision 1.16
diff -u -r1.16 BasicInternalFrameTitlePane.java
--- javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	18 Oct 2005 22:10:32 -0000	1.16
+++ javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	14 Nov 2005 12:38:57 -0000
@@ -771,11 +771,11 @@
    */
   protected void setButtonIcons()
   {
-    if (closeIcon != null)
+    if (closeIcon != null && closeButton != null)
       closeButton.setIcon(closeIcon);
-    if (iconIcon != null)
+    if (iconIcon != null && iconButton != null)
       iconButton.setIcon(iconIcon);
-    if (maxIcon != null)
+    if (maxIcon != null && maxButton != null)
       maxButton.setIcon(maxIcon);
   }