Better errors on corrupt shipments. #1637
Merge branch 'master' into workshop