Adds fix for trying to fetch email from invalid user object
Merge branch 'hotfixes'