trim emails
more verbose error message
Merge branch 'develop' into release