Fix to handle case where no family name is provided.