Updated error message to be more helpful

Also, added misssing test
Merge pull request #9 from lukaszb/mark-error-message

Updated error message to be more helpful.