Account for null/None field value