Add debug information on exception
Merge pull request #3 from robinedwards/master

Add debug information on exception