diff --git a/reclass/errors.py b/reclass/errors.py
index d3a0239..1dba529 100644
--- a/reclass/errors.py
+++ b/reclass/errors.py
@@ -90,7 +90,7 @@
         self._name = classname
         self._uri = uri
         self._nodename = nodename
-        msg = "Class '{0}' (in ancestry of node {1}) not found under {2}://{3}" \
+        msg = "Class '{0}' (in ancestry of node '{1}') not found under {2}://{3}" \
                 .format(self._name, self._nodename, self._storage, self._uri)
         super(ClassNotFound, self).__init__(msg)
 
diff --git a/reclass/storage/__init__.py b/reclass/storage/__init__.py
index 1f0e20a..93bab51 100644
--- a/reclass/storage/__init__.py
+++ b/reclass/storage/__init__.py
@@ -101,7 +101,7 @@
                 try:
                     class_entity = self._classes_cache[klass]
                 except KeyError, e:
-                    class_entity = self._get_class(klass)
+                    class_entity = self._get_class(klass, nodename)
                     self._classes_cache[klass] = class_entity
 
                 descent = self._recurse_entity(class_entity, seen=seen,