diff --git a/cinderclient/tests/unit/v2/test_capabilities.py b/cinderclient/tests/unit/v2/test_capabilities.py
index 0437cc0f2..01a132d95 100644
--- a/cinderclient/tests/unit/v2/test_capabilities.py
+++ b/cinderclient/tests/unit/v2/test_capabilities.py
@@ -53,3 +53,8 @@ class CapabilitiesTest(utils.TestCase):
         cap = Capabilities(None, FAKE_CAPABILITY)
         self.assertEqual(
             "<Capabilities: %s>" % FAKE_CAPABILITY['namespace'], repr(cap))
+
+    def test__repr__when_empty(self):
+        cap = Capabilities(None, {})
+        self.assertEqual(
+            "<Capabilities: None>", repr(cap))
diff --git a/cinderclient/v2/capabilities.py b/cinderclient/v2/capabilities.py
index 305397f44..2045f02be 100644
--- a/cinderclient/v2/capabilities.py
+++ b/cinderclient/v2/capabilities.py
@@ -22,7 +22,7 @@ class Capabilities(base.Resource):
     NAME_ATTR = 'name'
 
     def __repr__(self):
-        return "<Capabilities: %s>" % self._info['namespace']
+        return "<Capabilities: %s>" % self._info.get('namespace')
 
 
 class CapabilitiesManager(base.Manager):