Don't break if there is no message
Fix error if there is no email set