diff --git a/keystoneclient/service_catalog.py b/keystoneclient/service_catalog.py
index 5b179d969..c57e68ea5 100644
--- a/keystoneclient/service_catalog.py
+++ b/keystoneclient/service_catalog.py
@@ -77,7 +77,8 @@ class ServiceCatalog(object):
                 if not filter_value or endpoint.get(attr) == filter_value:
                     return endpoint[endpoint_type]
 
-        raise exceptions.EndpointNotFound('Endpoint not found.')
+        raise exceptions.EndpointNotFound('%s endpoint for %s not found.' %
+                                          (endpoint_type, service_type))
 
     def get_endpoints(self, service_type=None, endpoint_type=None):
         """Fetch and filter endpoints for the specified service(s).