Adding workaround for the mail session being null for now