Merge pull request #18 from melloc/error-reporting

Improve error reporting messages