diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
index 645f5bb66..ecb4c0063 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
@@ -599,6 +599,10 @@ public final class OpenPgpManager extends Manager {
                     return;
                 }
 
+                if (contentElement == null) {
+                    return;
+                }
+
                 else {
                     throw new AssertionError("Invalid element received: " + contentElement.getClass().getName());
                 }