Improved error message
Merge pull request #1393 from alex/clean-up-error-message

Improved error message