Index: modules/awt/src/main/java/common/java/awt/BorderLayout.java =================================================================== --- modules/awt/src/main/java/common/java/awt/BorderLayout.java (revision 449668) +++ modules/awt/src/main/java/common/java/awt/BorderLayout.java (working copy) @@ -169,6 +169,9 @@ public void addLayoutComponent(Component comp, Object constraints) { toolkit.lockAWT(); try { + if (comp == null) { + throw new NullPointerException("Component is null"); + } if ((constraints == null) || (constraints instanceof String)) { addLayoutComponent((String) constraints, comp); } else {