Fix the message copy to handle nil, optional fields