Improve EmailFinder with exception handling
Correct some mistakes