Add partial underscore to mail
Fix for exception logging finally