Fixing JSON Marshal Bug which forced status code 500