diff --git a/lib/core/queueHandler.js b/lib/core/queueHandler.js
index fa3a3033e2..90dca45d16 100644
--- a/lib/core/queueHandler.js
+++ b/lib/core/queueHandler.js
@@ -126,6 +126,10 @@ class QueueHandler {
         // FIXME handle rejections (i.e. failures while processing messages) properly
         queue.processingEnded(obj => {
           const message = obj.item;
+          // if we get a error message on the queue make sure we register that
+          if (message.type === 'error' || message.type.endsWith('.error')) {
+            this.errors.push(message.data);
+          }
           const err = obj.err;
           if (err) {
             let rejectionMessage =