diff --git a/lib/workers/cluster.create.js b/lib/workers/cluster.create.js
index c1a55877a..6389d7bb5 100644
--- a/lib/workers/cluster.create.js
+++ b/lib/workers/cluster.create.js
@@ -9,6 +9,7 @@ const ClusterConfigService = require('models/services/cluster-config-service')
 const joi = require('utils/joi')
 const pick = require('101/pick')
 const UserService = require('models/services/user-service')
+const WorkerStopError = require('error-cat/errors/worker-stop-error')
 
 module.exports.jobSchema = joi.object({
   sessionUserBigPoppaId: joi.number().required(),
@@ -31,5 +32,8 @@ module.exports.task = (job) => {
       const props = [ 'triggeredAction', 'repoFullName', 'branchName', 'filePath', 'isTesting', 'newInstanceName' ]
       const opts = pick(job, props)
       return ClusterConfigService.create(sessionUser, opts)
+        .catch(err => {
+          throw WorkerStopError('Something failed trying to create the config', { err })
+        })
     })
 }
diff --git a/unit/workers/cluster.create.js b/unit/workers/cluster.create.js
index 216a490c0..d19b7fe81 100644
--- a/unit/workers/cluster.create.js
+++ b/unit/workers/cluster.create.js
@@ -61,7 +61,6 @@ describe('Cluster Create Worker', function () {
         ClusterConfigService.create.rejects(mongoError)
         Worker.task(testData).asCallback(function (err) {
           expect(err).to.exist()
-          expect(err).to.equal(mongoError)
           done()
         })
       })