Merge branch 'master' into develop

sleekxmpp/plugins/xep_0153/vcard_avatar.py

@@ -12,6 +12,7 @@ import threading
 
 from sleekxmpp import JID
 from sleekxmpp.stanza import Presence
+from sleekxmpp.exceptions import XMPPError
 from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.xmlstream.matcher import StanzaPath
 from sleekxmpp.xmlstream.handler import Callback
@@ -103,6 +104,7 @@ class XEP_0153(BasePlugin):
         if own_jid:
             self.xmpp.roster[jid].send_last_presence()
 
+        try:
             iq = self.xmpp['xep_0054'].get_vcard(jid=jid.bare, ifrom=ifrom)
 
             data = iq['vcard_temp']['PHOTO']['BINVAL']
@@ -112,6 +114,8 @@ class XEP_0153(BasePlugin):
                 new_hash = hashlib.sha1(data).hexdigest()
 
             self.api['set_hash'](jid, args=new_hash)
+        except XMPPError:
+            log.debug('Could not retrieve vCard for %s' % jid)
 
     def _recv_presence(self, pres):
         if not pres.match('presence/vcard_temp_update'):