Added Errors for email checking
Merge remote-tracking branch 'origin/master'