Better error messages

Fixes #2