diff --git a/gajim/adhoc_commands.py b/gajim/adhoc_commands.py
index f6c68aa38..6525b974c 100644
--- a/gajim/adhoc_commands.py
+++ b/gajim/adhoc_commands.py
@@ -60,6 +60,7 @@ class CommandWindow:
         self.stage_back_button_cb = None
         self.stage_forward_button_cb = None
         self.stage_execute_button_cb = None
+        self.stage_finish_button_cb = None
         self.stage_close_button_cb = None
         self.stage_restart_button_cb = None
         self.stage_window_delete_cb = None
diff --git a/gajim/command_system/dispatcher.py b/gajim/command_system/dispatcher.py
index 513db2a73..ccdce57b5 100644
--- a/gajim/command_system/dispatcher.py
+++ b/gajim/command_system/dispatcher.py
@@ -88,7 +88,7 @@ def list_commands(host):
             yield name, command
 
 class Dispatchable(type):
-
+    # pylint: disable=no-value-for-parameter
     def __init__(self, name, bases, namespace):
         parents = super(Dispatchable, self)
         parents.__init__(name, bases, namespace)
diff --git a/gajim/command_system/framework.py b/gajim/command_system/framework.py
index c75e9e234..39d12ad0a 100644
--- a/gajim/command_system/framework.py
+++ b/gajim/command_system/framework.py
@@ -75,6 +75,7 @@ class CommandProcessor(object):
         Try to process text as a command. Returns True if it has been
         processed as a command and False otherwise.
         """
+        # pylint: disable=assignment-from-no-return
         prefix = text.startswith(self.COMMAND_PREFIX)
         length = len(text) > len(self.COMMAND_PREFIX)
         if not (prefix and length):