Add missing null checks for Long and Enum FieldData