Index: javax/swing/ScrollPaneLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ScrollPaneLayout.java,v
retrieving revision 1.16
diff -u -r1.16 ScrollPaneLayout.java
--- javax/swing/ScrollPaneLayout.java	12 Oct 2005 14:36:11 -0000	1.16
+++ javax/swing/ScrollPaneLayout.java	12 Oct 2005 19:48:19 -0000
@@ -287,9 +287,9 @@
           height += hsb.getMinimumSize().height;
         if (vsb.isVisible())
           width += vsb.getMinimumSize().width;
-        if (rowHead.isVisible())
+        if (rowHead != null && rowHead.isVisible())
           width += rowHead.getMinimumSize().width;
-        if (colHead.isVisible())
+        if (colHead != null && colHead.isVisible())
           height += colHead.getMinimumSize().height;
         return new Dimension(width, height);
       }