Fix case for empty/nil email address (also added prot for name)
Cosmetics: `whitespace-cleanup'