diff --git a/cinderclient/service_catalog.py b/cinderclient/service_catalog.py
index b43eaed6f..ce78b47be 100644
--- a/cinderclient/service_catalog.py
+++ b/cinderclient/service_catalog.py
@@ -79,7 +79,10 @@ class ServiceCatalog(object):
         if not matching_endpoints:
             raise cinderclient.exceptions.EndpointNotFound()
         elif len(matching_endpoints) > 1:
-            raise cinderclient.exceptions.AmbiguousEndpoints(
-                endpoints=matching_endpoints)
+            try:
+                eplist = [ep[attr] for ep in matching_endpoints]
+            except KeyError:
+                eplist = matching_endpoints
+            raise cinderclient.exceptions.AmbiguousEndpoints(endpoints=eplist)
         else:
             return matching_endpoints[0][endpoint_type]