diff --git a/jmdaemon/jmdaemon/message_channel.py b/jmdaemon/jmdaemon/message_channel.py
index 4c84ae8..ba6c6af 100644
--- a/jmdaemon/jmdaemon/message_channel.py
+++ b/jmdaemon/jmdaemon/message_channel.py
@@ -902,7 +902,7 @@ class MessageChannel(object):
                     to_decrypt = ''.join(_chunks[1:])
                     try:
                         decrypted = decode_decrypt(to_decrypt, box)
-                    except (ValueError, TypeError) as e:
+                    except Exception as e:
                         log.debug('Error when decrypting, skipping: ' +
                                   repr(e))
                         return