summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--slixmpp/plugins/xep_0313/mam.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/slixmpp/plugins/xep_0313/mam.py b/slixmpp/plugins/xep_0313/mam.py
index cc3b1958..02efd3ce 100644
--- a/slixmpp/plugins/xep_0313/mam.py
+++ b/slixmpp/plugins/xep_0313/mam.py
@@ -225,9 +225,10 @@ class XEP_0313(BasePlugin):
iq['mam']['with'] = with_jid
stanza_mask = self.xmpp.Message()
- stanza_mask.xml.remove(
- stanza_mask.xml.find('{urn:xmpp:sid:0}origin-id')
- )
+
+ auto_origin = stanza_mask.xml.find('{urn:xmpp:sid:0}origin-id')
+ if auto_origin is not None:
+ stanza_mask.xml.remove(auto_origin)
del stanza_mask['id']
del stanza_mask['lang']
stanza_mask['from'] = jid