Improve error handling and messaging.
Merge pull request #9 from jeinnovate/master

Improve error handling and messaging.