X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=895681fb0431c5c19480cd954e10ce45e3579652;hp=b275c9dfc3020f9ec30b2ab7ce5dcc5eacf2cf79;hb=0c54b74fc47304e2d6e70b604e15ef3827fa59d4;hpb=fc1dd91f69608497a714a3c013e6b1baccd9dcac

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index b275c9dfc..895681fb0 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -353,12 +353,16 @@ sub send_email {
     $smtp_opt{'ssl'} = 1 if defined($enc) && $enc eq 'tls';
     $transport = Email::Sender::Transport::SMTP->new( %smtp_opt );
   }
-
-  eval { sendmail($message, { transport => $transport }); };
-  ref($@) eq 'Email::Sender::Failure'
-    ? ( $@->code ? $@->code.' ' : '' ). $@->message
-    : $@;
-
+  
+  local $@; # just in case
+  eval { sendmail($message, { transport => $transport }) };
+ 
+  if(ref($@) and $@->isa('Email::Sender::Failure')) {
+    return ($@->code ? $@->code.' ' : '').$@->message
+  }
+  else {
+    return $@;
+  }
 }
 
 =item send_fax OPTION => VALUE ...