Change to deal more gracefully with null menu items.