Merge pull request #347 from alex/better-error-emssage

Better error emssage