fix error handling, patch and ship - fixes #88