Request to merge email branch

Use a guard clause instead of wrapping the code inside a conditional expression.