BroadleafCommerce/BroadleafCommerce#485  - adding null check for first shippable fg