Handle non-existant email addresses better