Modified error messages
Merge pull request #288 from jankoboehm/master

Modified error messages