diff --git a/pisi-cli b/pisi-cli
index f5dc1dd5..105d72eb 100755
--- a/pisi-cli
+++ b/pisi-cli
@@ -54,7 +54,7 @@ Please file a bug report. (http://bugs.uludag.org.tr)"""))
     if ctx.get_option('debug'):
         ui.error("%s: %s" % (exception, v))
     else:
-        ui.error(v)
+         ui.error(v)
 
     ui.info(_("Please use 'pisi help' for general help."))
 
diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index d3e5bf70..0c7db1fc 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -43,9 +43,9 @@ class Command(object):
         list = [x.name[0] for x in Command.cmd]
         list.sort()
         for name in list:
-            command = Command.get_command(name)
-            summary = command.__doc__.split('\n')[0]
-            s += '%25s - %s\n' % (command.format_name(), summary)
+            commandcls = Command.cmd_dict[name]
+            summary = commandcls.__doc__.split('\n')[0]
+            s += '%20s - %s\n' % (commandcls.name[0], summary)
         return s
 
     @staticmethod