[#7819] handle email lookups of None
2 files changed