Improve exception message
Merge pull request #45 from winzou/exception

Improve exception message