catch errors from json.parse
Merge branch 'json-parse-catch-error' into mine