More error handling fixes
Merge pull request #300 from krazemon/infra/verification-emails

SMALL FIXES for ERRORS