diff --git a/ccserver/handlers.py b/ccserver/handlers.py
index 6a20459d8c633973feab67d372ca70f73afb1dbd..f284f5652e8c38d30479415f191e3b3c570ff7f8 100644
--- a/ccserver/handlers.py
+++ b/ccserver/handlers.py
@@ -37,7 +37,9 @@ class CCHandler(RpcHandler):
             if getattr(attr, '__listed__', False):
                 cmd = {}
                 cmd['name'] = attr.__name__
-                cmd['description'] = inspect.cleandoc(inspect.getdoc(attr))
+                doc = inspect.getdoc(attr)
+                if doc:
+                    cmd['description'] = inspect.cleandoc(doc)
                 cmd_list.append(cmd)
 
         return cmd_list