add check for null emails