Committing Chris's changes to the JSON error reporting