Handle potential null values for some fields