Improved error messages
Ticket 437
Merge pull request #8 from sjcjoosten/master

Improved error messages