new error messsages
Merge pull request #867 from adrianob/new_errors

new error messsages