Improve error handling
Fixed a typo in the changelog file
Merge pull request #1 from lokedhs/master

Improve error handling