Cleaner error messages

Fixes #6