diff --git a/dynamic/discovery.py b/dynamic/discovery.py
index 24d48d81..d2f801f2 100644
--- a/dynamic/discovery.py
+++ b/dynamic/discovery.py
@@ -254,8 +254,11 @@ def __search(self,  parts, resources, reqParams):
                 # Check if we've requested resources for this group
                 if not resourcePart.resources:
                     prefix, group, version = reqParams[0], reqParams[1], part
-                    resourcePart.resources = self.get_resources_for_api_version(
-                        prefix, group, part, resourcePart.preferred)
+                    try:
+                        resourcePart.resources = self.get_resources_for_api_version(
+                            prefix, group, part, resourcePart.preferred)
+                    except NotFoundError:
+                        raise ResourceNotFoundError
 
                     self._cache['resources'][prefix][group][version] = resourcePart
                     self.__update_cache = True