Providing better error messages
Merge pull request #716 from shenrie/master

Providing better error messages