[DS-2034] Check for null (unset) properties and replace with an indicator