throw an error if the ship could not be found
Merge branch 'master' into ship-placement