Don't drop the exception message from the error message if we get an error parsing
Merge pull request #3631 from benmccann/parse-err-msg

Don't drop the exception message from the error message if we get an error parsing