Only update civicrm_id if it's present