Modify return type when return code not 200