diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index c0b7fb6f..3e8d21fe 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -392,7 +392,17 @@ def wait(msg_id, module_build_id, module_build_state):
         "Adding dependencies %s into buildroot for module %s:%s:%s",
         build_deps.keys(), build.name, build.stream, build.version,
     )
-    builder.buildroot_add_repos(build_deps)
+    try:
+        builder.buildroot_add_repos(build_deps)
+    except SystemError as e:
+        reason = "Failed to add dependencies to buildroot: %s" % e
+        log.exception(reason)
+        build.transition(
+            db_session, conf,
+            state=models.BUILD_STATES["failed"],
+            state_reason=reason, failure_type="infra")
+        db_session.commit()
+        raise
 
     if not build.component_builds:
         log.info("There are no components in module %r, skipping build" % build)