diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py
index 7ffaba681..e98f7a2c4 100644
--- a/keystoneclient/v2_0/client.py
+++ b/keystoneclient/v2_0/client.py
@@ -149,7 +149,7 @@ class Client(client.HTTPClient):
         # to determine what to do. Otherwise, load up the service catalog
         self.auth_token = self.auth_ref.auth_token
         if self.auth_ref.scoped:
-            if self.management_url is None:
+            if self.management_url is None and self.auth_ref.management_url:
                 self.management_url = self.auth_ref.management_url[0]
             self.tenant_name = self.auth_ref.tenant_name
             self.tenant_id = self.auth_ref.tenant_id