More handling of missing names and addresses.