Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 3 insertions, 3 deletions

diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm
index 4cf4184a4..dd73d9049 100644
--- a/rt/lib/RT/EmailParser.pm
+++ b/rt/lib/RT/EmailParser.pm
@@ -576,10 +576,10 @@ sub RescueOutlook {
         my $text_part;
         if ( $mime->head->get('Content-Type') =~ m{multipart/mixed} ) {
             my $first = $mime->parts(0);
-            if ( $first->head->get('Content-Type') =~ m{multipart/alternative} )
+            if ( $first && $first->head->get('Content-Type') =~ m{multipart/alternative} )
             {
                 my $inner_first = $first->parts(0);
-                if ( $inner_first->head->get('Content-Type') =~ m{text/plain} )
+                if ( $inner_first && $inner_first->head->get('Content-Type') =~ m{text/plain} )
                 {
                     $text_part = $inner_first;
                 }
@@ -587,7 +587,7 @@ sub RescueOutlook {
         }
         elsif ( $mime->head->get('Content-Type') =~ m{multipart/alternative} ) {
             my $first = $mime->parts(0);
-            if ( $first->head->get('Content-Type') =~ m{text/plain} ) {
+            if ( $first && $first->head->get('Content-Type') =~ m{text/plain} ) {
                 $text_part = $first;
             }
         }