Merge pull request #47 from ovatsus/master

Improve error messages