Ship modified to present clearer error messages