Merge "Add null check before calling parsePhoneNumber" into main