diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index 8996c35ac..370e596c5 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -346,7 +346,8 @@ class BuildComponent(BaseComponent):
 
       # Mark the build as completed.
       if worker_error.is_internal_error():
-        logger.exception('Got remote internal exception for build: %s', build_id)
+        logger.exception('[BUILD INTERNAL ERROR: Remote] Build ID: %s: %s', build_id,
+                         worker_error.public_message())
         trollius.async(self._build_finished(BuildJobResult.INCOMPLETE))
       else:
         logger.debug('Got remote failure exception for build %s: %s', build_id, aex)
@@ -462,6 +463,8 @@ class BuildComponent(BaseComponent):
       self._build_status.set_error('Build worker timed out', internal_error=True,
                                    requeued=self._current_job.has_retries_remaining())
 
+      build_id = self._current_job.build_uuid
+      logger.error('[BUILD INTERNAL ERROR: Timeout] Build ID: %s', build_id)
       yield From(self.parent_manager.job_completed(self._current_job,
                                                    BuildJobResult.INCOMPLETE,
                                                    self))
diff --git a/buildman/manager/ephemeral.py b/buildman/manager/ephemeral.py
index 9e8c30f57..f9e05404e 100644
--- a/buildman/manager/ephemeral.py
+++ b/buildman/manager/ephemeral.py
@@ -199,7 +199,8 @@ class EphemeralBuilderManager(BaseManager):
         got_lock = yield From(self._take_etcd_atomic_lock('job-expired', build_job.build_uuid,
                                                           execution_id))
         if got_lock:
-          logger.warning('Marking job %s as incomplete', build_job.build_uuid)
+          logger.error('[BUILD INTERNAL ERROR: etcd %s] Build ID: %s. Exec name: %s. Exec ID: %s',
+                       etcd_result.action, build_job.build_uuid, executor_name, execution_id)
           self.job_complete_callback(build_job, BuildJobResult.INCOMPLETE, executor_name,
                                      update_phase=True)