Add null protection for phone number