Improve JSON Parsing exception handler.
Merge branch 'master' into stringify