diff --git a/master/buildbot/process/buildrequestdistributor.py b/master/buildbot/process/buildrequestdistributor.py
index 1a2b1e7715f..50bac814f95 100644
--- a/master/buildbot/process/buildrequestdistributor.py
+++ b/master/buildbot/process/buildrequestdistributor.py
@@ -262,6 +262,8 @@ def _getNextUnclaimedBuildRequest(self):
                 if nextBreq not in breqs:
                     nextBreq = None
             except Exception:
+                log.err(Failure(),
+                        "from _getNextUnclaimedBuildRequest for builder '%s'" % (self.bldr,))
                 nextBreq = None
         else:
             # otherwise just return the first build
diff --git a/master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py b/master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
index 6f2df2eff2c..19a6bd7dabf 100644
--- a/master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
+++ b/master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
@@ -740,6 +740,7 @@ def test_nextBuild_bogus(self):
         yield self.do_test_maybeStartBuildsOnBuilder(rows=rows,
                 exp_claims=[], exp_builds=[])
 
+    @compat.usesFlushLoggedErrors
     @defer.inlineCallbacks
     def test_nextBuild_fails(self):
         def nextBuildRaises(*args):
@@ -749,8 +750,10 @@ def nextBuildRaises(*args):
         rows = self.base_rows + [
             fakedb.BuildRequest(id=11, buildsetid=11, buildername="A"),
         ]
-        yield self.do_test_maybeStartBuildsOnBuilder(rows=rows,
+        result = self.do_test_maybeStartBuildsOnBuilder(rows=rows,
                 exp_claims=[], exp_builds=[])
+        self.assertEqual(1, len(self.flushLoggedErrors(RuntimeError)))
+        yield result
 
 
     # check concurrency edge cases
@@ -872,15 +875,22 @@ def nextBuild(bldr, lst):
             return defer.succeed(lst[-1])
         return self.do_test_nextBuild(nextBuild, exp_choice=[13, 12, 11, 10])
 
+    @compat.usesFlushLoggedErrors
     def test_nextBuild_exception(self):
         def nextBuild(bldr, lst):
             raise RuntimeError("")
-        return self.do_test_nextBuild(nextBuild)
+        result = self.do_test_nextBuild(nextBuild)
+        self.assertEqual(1, len(self.flushLoggedErrors(RuntimeError)))
+        return result
 
+
+    @compat.usesFlushLoggedErrors
     def test_nextBuild_failure(self):
         def nextBuild(bldr, lst):
             return defer.fail(failure.Failure(RuntimeError()))
-        return self.do_test_nextBuild(nextBuild)
+        result = self.do_test_nextBuild(nextBuild)
+        self.assertEqual(1, len(self.flushLoggedErrors(RuntimeError)))
+        return result
 
 
     # merge tests