Fix O&M possible null values for names