Checks give a better error message
Merge pull request #1633 from nremond/err_msg

Checks give a better error message