Index: modules/awt/src/main/java/common/java/awt/MenuBar.java =================================================================== --- modules/awt/src/main/java/common/java/awt/MenuBar.java (revision 474775) +++ modules/awt/src/main/java/common/java/awt/MenuBar.java (working copy) @@ -184,6 +184,7 @@ } public void remove(MenuComponent menu) { + if (menu == null) return; toolkit.lockAWT(); try { menuList.remove(menu); @@ -311,9 +312,6 @@ } public void setHelpMenu(Menu menu) { - if (menu == null) { - throw new NullPointerException(); - } toolkit.lockAWT(); try { if (helpMenu == menu) {