diff --git a/omemo/omemo_connection.py b/omemo/omemo_connection.py
index b01517e..213c845 100644
--- a/omemo/omemo_connection.py
+++ b/omemo/omemo_connection.py
@@ -227,6 +227,10 @@ class OMEMOConnection:
             from_jid = app.get_jid_without_resource(from_jid)
 
             msg_dict = unpack_encrypted(omemo_encrypted_tag)
+            if msg_dict is None:
+                log.error('Invalid omemo message received:\n%s', msg.msg_)
+                msg.encrypted = 'drop'
+                return
 
             msg_dict['sender_jid'] = from_jid