Fixed issue where non-existent email address would not be caught.