Fixed bug so empty shipments don't exist and hit db constraints