REPORT-611:  Add conditional null handling to MapConverter