diff --git a/externals/mimemailparser/MimeMailParser.class.php b/externals/mimemailparser/MimeMailParser.class.php
index 40ab1640f5..dfd7a2fa11 100644
--- a/externals/mimemailparser/MimeMailParser.class.php
+++ b/externals/mimemailparser/MimeMailParser.class.php
@@ -308,10 +308,10 @@ class MimeMailParser {
 	 * @param $part Array
 	 */
 	private function getPartHeaders($part) {
-		if (isset($part['headers'])) {
+		if (isset($part['headers']) && $part['headers']) {
 			return $part['headers'];
 		}
-		return false;
+		throw new Exception('MimeMailParser::getHeaders() could not parse any email headers.');
 	}
 
 	/**
diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index bf6f315f3a..5631310a2b 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -55,7 +55,9 @@ foreach (array('text', 'html') as $part) {
 }
 
 $headers = $parser->getHeaders();
-$headers['subject'] = phutil_decode_mime_header($headers['subject']);
+if (array_key_exists('subject', $headers)) {
+  $headers['subject'] = phutil_decode_mime_header($headers['subject']);
+}
 $headers['from'] = phutil_decode_mime_header($headers['from']);
 
 if ($args->getArg('process-duplicates')) {