diff --git a/src/memory/disco.py b/src/memory/disco.py
index 70179da4..3b083d70 100755
--- a/src/memory/disco.py
+++ b/src/memory/disco.py
@@ -154,7 +154,8 @@ class Discovery(object):
         @param type_: identitiy's type
         @param jid_: the jid of the target server (None for profile's server)
         @param profile_key: %(doc_profile_key)s
-        @return: a set of entities or None if no cached data were found
+        @return: a set of found entities
+        @raise CancelError: the request timed out
         """
         found_entities = set()
 
diff --git a/src/memory/memory.py b/src/memory/memory.py
index ff1ad2b9..bcbd455c 100644
--- a/src/memory/memory.py
+++ b/src/memory/memory.py
@@ -361,6 +361,7 @@ class Memory(object):
         @param profile_key: can be the profile name or a keywork (like @DEFAULT@)
         @param return_profile_keys: if True, return unmanaged profile keys (like "@ALL@"). This keys must be managed by the caller
         @return: requested profile name or emptry string if it doesn't exist
+        @raise exceptions.ProfileUnknownError if profile doesn't exists
         """
         return self.params.getProfileName(profile_key, return_profile_keys)
 
diff --git a/src/memory/params.py b/src/memory/params.py
index ab400755..3e307947 100644
--- a/src/memory/params.py
+++ b/src/memory/params.py
@@ -186,7 +186,9 @@ class Params(object):
                             @ALL@ for all profiles
                             @DEFAULT@ for default profile
         @param return_profile_keys: if True, return unmanaged profile keys (like "@ALL@"). This keys must be managed by the caller
-        @return: requested profile name or emptry string if it doesn't exist"""
+        @return: requested profile name
+        @raise exceptions.ProfileUnknownError if profile doesn't exists
+        """
         if profile_key == '@DEFAULT@':
             default = self.host.memory.memory_data.get('Profile_default')
             if not default:
@@ -203,7 +205,7 @@ class Params(object):
             return profile_key # this value must be managed by the caller
         if not self.storage.hasProfile(profile_key):
             log.error(_(u'Trying to access an unknown profile (%s)') % profile_key)
-            return "" # FIXME: raise exceptions.ProfileUnknownError here (must be well checked, this method is used in lot of places)
+            raise exceptions.ProfileUnknownError
         return profile_key
 
     def __get_unique_node(self, parent, tag, name):
diff --git a/src/plugins/__init__.py b/src/plugins/__init__.py
index e0cb64ea..953878a4 100644
--- a/src/plugins/__init__.py
+++ b/src/plugins/__init__.py
@@ -1,4 +1,5 @@
-# TODO: remove this when RSM and MAM are in wokkel
+# FIXME: remove this when RSM and MAM are in wokkel
+# XXX: the Monkey Patch is here and not in src/__init__ to avoir issues with pyjamas compilation
 import wokkel
 from sat.tmp.wokkel import delay as tmp_delay, pubsub as tmp_pubsub, rsm as tmp_rsm, mam as tmp_mam
 wokkel.delay = tmp_delay