Make error message more explicit
Merge pull request #891 from jranke/master

Make error message more explicit