Add checks in ResponseModel during parsing