Make error handling a bit more consistent :office:

Fixes #16, more or less.