Merge pull request #5 from mgroeneweg/master

Nice! We will merge this into the widget. :-).
- Fix error message handling and minor changes