Fixed error reporting by email
Merge branch 'hotfix/bugs'