Add check for nil shipping_method on shipment