Fixes wip #781

Add better error message to helpful email checker