Merge pull request #10 from wiesom/dev

Improve error handling and error messaging