Imporove error messages.
Merge pull request #40 from yogthos/errors

Imporove error messages.