Fail on error, some message tweaks.

Closes #2.