diff --git a/src/memory/disco.py b/src/memory/disco.py
index ca1ffd88..2d2e89ff 100755
--- a/src/memory/disco.py
+++ b/src/memory/disco.py
@@ -172,7 +172,7 @@ class Discovery(object):
         @param jid_: the jid of the target server (None for profile's server)
         @param profile: %(doc_profile)s
         @return: a set of found entities
-        @raise CancelError: the request timed out
+        @raise defer.CancelledError: the request timed out
         """
         found_entities = set()
 
diff --git a/src/plugins/plugin_xep_0065.py b/src/plugins/plugin_xep_0065.py
index 4a973e9b..7358e975 100755
--- a/src/plugins/plugin_xep_0065.py
+++ b/src/plugins/plugin_xep_0065.py
@@ -760,7 +760,7 @@ class XEP_0065(object):
             pass
         try:
             proxy = (yield self.host.findServiceEntities('proxy', 'bytestreams', profile=profile)).pop()
-        except (exceptions.CancelError, StopIteration):
+        except (defer.CancelledError, StopIteration):
             notFound(server)
         iq_elt = client.IQ('get')
         iq_elt['to'] = proxy.full()