diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index c4c8544d1..51819e95b 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -195,6 +195,9 @@ class BuildComponent(BaseComponent):
 
   def _on_log_message(self, phase, json_data):
     """ Tails log messages and updates the build status. """
+    # Update the heartbeat.
+    self._last_heartbeat = datetime.datetime.utcnow()
+
     # Parse any of the JSON data logged.
     docker_data = {}
     if json_data:
@@ -416,7 +419,9 @@ class BuildComponent(BaseComponent):
       self._build_status.set_error('Build worker timed out', internal_error=True,
                                    requeued=self._current_job.has_retries_remaining())
 
-      self.parent_manager.job_completed(self._current_job, BuildJobResult.INCOMPLETE, self)
+      yield trollius.From(self.parent_manager.job_completed(self._current_job,
+                                                            BuildJobResult.INCOMPLETE,
+                                                            self))
       self._build_status = None
       self._current_job = None