diff --git a/xmpp_tg/message_handlers.py b/xmpp_tg/message_handlers.py
index 48a6138..bee7438 100644
--- a/xmpp_tg/message_handlers.py
+++ b/xmpp_tg/message_handlers.py
@@ -7,19 +7,19 @@ from xmpp_tg.utils import var_dump, display_tg_name, get_contact_jid, localtime
 
 # modified by adnidor
 
-class MessageHandler():
+class WrongNumberOfArgsError(Exception):
+    pass
+
+class CommandHandler():
     _on_connect = lambda: None
     _helptext = "Available Commands:"
 
     def _unknown_command_handler(self, *args, **kwargs):
         return "Unknown command, for a list send !help"
 
-    class WrongNumberOfArgsError(Exception):
-        pass
-
     def _min_args(self, num_args):
         if len(self.arguments) < num_args:
-            raise self.WrongNumberOfArgsError("!{} needs at least {} arguments".format(self._command, num_args))
+            raise WrongNumberOfArgsError("!{} needs at least {} arguments".format(self._command, num_args))
 
     def __init__(self, msg):
         self._command = msg["body"].split(" ")[0][1:]
@@ -82,7 +82,7 @@ class MessageHandler():
             reply = trim(method.__doc__)
             return reply
 
-class GateMessageHandler(MessageHandler):
+class GateCommandHandler(CommandHandler):
     _helptext = "Available Gateway commands:"
 
     def configure(hndl, self):
@@ -316,7 +316,7 @@ class GateMessageHandler(MessageHandler):
 
                 '!roster - Lists yout TG roster\n')
 
-class ChatCommandHandler(MessageHandler):
+class ChatCommandHandler(CommandHandler):
     _helptext = "Available Userchat commands:"
 
     def __init__(self, msg):
@@ -363,7 +363,7 @@ class ChatCommandHandler(MessageHandler):
             del(self.tg_dialogs[hndl.jid]['messages'][hndl.tg_id])
             self.tg_connections[hndl.jid].invoke( DeleteMessagesRequest([msg_id], revoke = True) )
 
-class GroupchatCommandHandler(MessageHandler):
+class GroupchatCommandHandler(CommandHandler):
     _helptext = "Available Groupchat commands:"
 
     def __init__(self, msg):
diff --git a/xmpp_tg/xmpp.py b/xmpp_tg/xmpp.py
index 0c4d885..1e7a9c4 100644
--- a/xmpp_tg/xmpp.py
+++ b/xmpp_tg/xmpp.py
@@ -279,7 +279,7 @@ class XMPPTelegram(ComponentXMPP):
 
         if is_command:
             command = msg["body"].split(" ")[0][1:]
-            handler = GateMessageHandler(msg)._handler
+            handler = GateCommandHandler(msg)._handler
             try:
                 reply = str(handler(self))
             except Exception as e:
@@ -290,7 +290,7 @@ class XMPPTelegram(ComponentXMPP):
                 else:
                     if isinstance(e, NotAuthorizedError):
                         reply = str(e)
-                    elif isinstance(e, MessageHandler.WrongNumberOfArgsError):
+                    elif isinstance(e, WrongNumberOfArgsError):
                         reply = str(e)
                     else:
                         logging.error("Exception in command from {}, command was '{}'".format(msg["from"],msg["body"]))
@@ -317,7 +317,7 @@ class XMPPTelegram(ComponentXMPP):
                 else:
                     if isinstance(e, NotAuthorizedError):
                         reply = str(e)
-                    elif isinstance(e, MessageHandler.WrongNumberOfArgsError):
+                    elif isinstance(e, WrongNumberOfArgsError):
                         reply = str(e)
                     else:
                         logging.error("Exception in command from {}, command was '{}'".format(msg["from"],msg["body"]))
@@ -344,7 +344,7 @@ class XMPPTelegram(ComponentXMPP):
                 else:
                     if isinstance(e, NotAuthorizedError):
                         reply = str(e)
-                    elif isinstance(e, MessageHandler.WrongNumberOfArgsError):
+                    elif isinstance(e, WrongNumberOfArgsError):
                         reply = str(e)
                     else:
                         logging.error("Exception in command from {}, command was '{}'".format(msg["from"],msg["body"]))