Catch a null pointer exception thrown for invalid json
Merge remote-tracking branch 'origin/master'