Removed debug on error messages
Merge branch 'master' into gmail