Fixed issue with nil order status
Fix issue with nil shipment status