Reflect change in the API and make sure string is not null or empty