diff --git a/projects/samskivert/src/java/com/samskivert/swing/GroupLayout.java b/projects/samskivert/src/java/com/samskivert/swing/GroupLayout.java
index 24b2f0eb..2db5d704 100644
--- a/projects/samskivert/src/java/com/samskivert/swing/GroupLayout.java
+++ b/projects/samskivert/src/java/com/samskivert/swing/GroupLayout.java
@@ -356,7 +356,7 @@ public abstract class GroupLayout
      */
     public static JPanel makeButtonBox (Justification justification)
     {
-        return new JPanel(new HGroupLayout(NONE, justification));
+        return makeButtonBox(justification, null);
     }
 
     /**
@@ -368,8 +368,10 @@ public abstract class GroupLayout
         Justification justification, JComponent button)
     {
         JPanel box = new JPanel(new HGroupLayout(NONE, justification));
-        box.add(button);
-        box.setOpaque(false);
+        if (button != null) {
+            box.add(button);
+            box.setOpaque(false);
+        }
         return box;
     }