diff --git a/module_build_service/scheduler/consumer.py b/module_build_service/scheduler/consumer.py
index b2f336db..c9ff4fb2 100644
--- a/module_build_service/scheduler/consumer.py
+++ b/module_build_service/scheduler/consumer.py
@@ -187,6 +187,10 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer):
             log.debug("Unhandled message...")
             return
 
+        if not build:
+            log.debug("No module associated with msg {}".format(msg.msg_id))
+            return
+
         # Execute our chosen handler
         idx = "%s: %s, %s" % (handler.__name__, type(msg).__name__, msg.msg_id)
         if handler is self.NO_OP:
@@ -194,12 +198,7 @@ class MBSConsumer(fedmsg.consumers.FedmsgConsumer):
         else:
             log.debug("Calling %s" % idx)
             try:
-                if build:
-                    further_work = handler(conf, session, msg) or []
-                else:
-                    further_work = []
-                    log.warn("There's no module associated with message ID {}"
-                             .format(msg.msg_id))
+                further_work = handler(conf, session, msg) or []
             except ValidationError as e:
                 if build:
                     build.transition(conf, state=models.BUILD_STATES['failed'],