Adding more checks to prevent shipments from failing