Added back detailed message on error
Merge pull request #30 from jerv13/master

Added back detailed message on error
Merge remote-tracking branch 'upstream/master' into sandbox