Critical bug fix - crash when requesting
Added extra test when parsing to json