diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index f44b48f85a..a70a9c42f9 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -169,6 +169,7 @@ class BulkOperationsMixin(object):
     def __init__(self, *args, **kwargs):
         super(BulkOperationsMixin, self).__init__(*args, **kwargs)
         self._active_bulk_ops = ActiveBulkThread(self._bulk_ops_record_type)
+        self.signal_handler = None
 
     @contextmanager
     def bulk_operations(self, course_id, emit_signals=True):
diff --git a/common/lib/xmodule/xmodule/util/null_handler.py b/common/lib/xmodule/xmodule/util/null_handler.py
index b5e36f6901..a628f43fdc 100644
--- a/common/lib/xmodule/xmodule/util/null_handler.py
+++ b/common/lib/xmodule/xmodule/util/null_handler.py
@@ -1,9 +1,10 @@
+# pylint: disable=missing-docstring
+
 class NullHandler(object):
     """
     Responds to an any method call.
     """
     def __getattr__(self, name):
-        def method(*args, **kwargs):
+        def method(*args, **kwargs): # pylint: disable=unused-argument
             pass
         return method
-