diff --git a/src/command_system/framework.py b/src/command_system/framework.py
index f46f701c5..3faa9ea68 100644
--- a/src/command_system/framework.py
+++ b/src/command_system/framework.py
@@ -158,7 +158,7 @@ class Command(object):
         # in case if they was not set by the one who raised an exception.
         except CommandError, error:
             if not error.command and not error.name:
-                raise CommandError(exception.message, self)
+                raise CommandError(error.message, self)
             raise
 
         # This one is a little bit too wide, but as Python does not have
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index d46d07a09..50623cb9a 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -22,6 +22,7 @@ from common import gajim
 from common import helpers
 from common.exceptions import GajimGeneralException
 
+from ..errors import CommandError
 from ..framework import CommandContainer, command, documentation
 from ..mapping import generate_usage