Merge branches 'production' and 'master'
catch json parse errors