Merge pull request #538 from iamqizhao/master

Improve an error message