@@ -9,6 +9,7 @@ catalog list
 
 List services in the service catalog
 
+.. program:: catalog list
 .. code:: bash
 
     os catalog list
@@ -18,7 +19,12 @@ catalog show
 
 Display service catalog details
 
+.. program:: catalog show
 .. code:: bash
 
     os catalog show
         <service>
+
+.. describe:: <service>
+
+    Service to display (type or name)
@@ -68,7 +68,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             'service',
             metavar='<service>',
-            help=_('Service to display (type, name or ID)'),
+            help=_('Service to display (type or name)'),
         )
         return parser
 
@@ -91,4 +91,9 @@ def take_action(self, parsed_args):
                     data.pop('endpoints_links')
                 break
 
+        if not data:
+            self.app.log.error('service %s not found\n' %
+                               parsed_args.service)
+            return ([], [])
+
         return zip(*sorted(six.iteritems(data)))