Check delay field existence

Import missing class

2 files changed, 7 insertions, 4 deletions

diff --git a/sleekxmpp/plugins/xep_0091/stanza.py b/sleekxmpp/plugins/xep_0091/stanza.py
index 0b70ff63..17e55764 100644
--- a/sleekxmpp/plugins/xep_0091/stanza.py
+++ b/sleekxmpp/plugins/xep_0091/stanza.py
@@ -21,14 +21,15 @@ class LegacyDelay(ElementBase):
     interfaces = set(('from', 'stamp', 'text'))
 
     def get_from(self):
-        return JID(self._get_attr('from'))
+        from_ = self._get_attr('from')
+        return JID(from_) if from_ else None
 
     def set_from(self, value):
         self._set_attr('from', str(value))
 
     def get_stamp(self):
         timestamp = self._get_attr('stamp')
-        return xep_0082.parse('%sZ' % timestamp)
+        return xep_0082.parse('%sZ' % timestamp) if timestamp else None
 
     def set_stamp(self, value):
         if isinstance(value, dt.datetime):
diff --git a/sleekxmpp/plugins/xep_0203/stanza.py b/sleekxmpp/plugins/xep_0203/stanza.py
index 9a11cae9..e147e975 100644
--- a/sleekxmpp/plugins/xep_0203/stanza.py
+++ b/sleekxmpp/plugins/xep_0203/stanza.py
@@ -8,6 +8,7 @@
 
 import datetime as dt
 
+from sleekxmpp.jid import JID
 from sleekxmpp.xmlstream import ElementBase
 from sleekxmpp.plugins import xep_0082
 
@@ -20,14 +21,15 @@ class Delay(ElementBase):
     interfaces = set(('from', 'stamp', 'text'))
 
     def get_from(self):
-        return JID(self._get_attr('from'))
+        from_ = self._get_attr('from')
+        return JID(from_) if from_ else None
 
     def set_from(self, value):
         self._set_attr('from', str(value))
 
     def get_stamp(self):
         timestamp = self._get_attr('stamp')
-        return xep_0082.parse(timestamp)
+        return xep_0082.parse(timestamp) if timestamp else None
 
     def set_stamp(self, value):
         if isinstance(value, dt.datetime):