diff --git a/src/plugins/plugin_xep_0054.py b/src/plugins/plugin_xep_0054.py
index e8087c30..cd5c5134 100755
--- a/src/plugins/plugin_xep_0054.py
+++ b/src/plugins/plugin_xep_0054.py
@@ -98,7 +98,12 @@ class XEP_0054(object):
         @return (bool): True if the bare jid of the entity is a room jid
         """
         try:
-            self.host.plugins['XEP-0045'].checkRoomJoined(client, entity_jid.userhostJID())
+            muc_plg = self.host.plugins['XEP-0045']
+        except KeyError:
+            return False
+
+        try:
+            muc_plg.checkRoomJoined(client, entity_jid.userhostJID())
         except exceptions.NotFound:
             return False
         else:
@@ -356,6 +361,8 @@ class XEP_0054(object):
         @param hash_only(bool): if True only return hash, not full path
         @raise exceptions.NotFound: no avatar found
         """
+        if not entity.resource and self.isRoom(client, entity):
+            raise exceptions.NotFound
         entity = self.getBareOrFull(client, entity)
         full_path = None