diff --git a/pyas2lib/as2.py b/pyas2lib/as2.py
index f5858a3..29c7e84 100644
--- a/pyas2lib/as2.py
+++ b/pyas2lib/as2.py
@@ -1018,6 +1018,11 @@ async def aparse(self, raw_content, find_message_cb):
                 details_status = "original-message-not-found"
                 return status, details_status
 
+            if not orig_message:
+                status = "failed/Failure"
+                details_status = "original-message-not-found"
+                return status, details_status
+
             # Extract the headers and save it
             mdn_headers = {}
             for k, v in self.payload.items():