Better handling of json parse errors
1.0.21