diff --git a/lib/cashbox-batches.js b/lib/cashbox-batches.js
index 0e24cb71..f459c078 100644
--- a/lib/cashbox-batches.js
+++ b/lib/cashbox-batches.js
@@ -3,7 +3,7 @@ const _ = require('lodash/fp')
 const uuid = require('uuid')
 
 function createCashboxBatch (deviceId, cashboxCount) {
-  if (_.isEqual(0, cashboxCount)) throw new Error('Cashbox is empty. Cashbox batch could not be created')
+  if (_.isEqual(0, cashboxCount)) throw new Error('Cashbox is empty. Cashbox batch could not be created.')
   const sql = `INSERT INTO cashbox_batches (id, device_id, created, operation_type) VALUES ($1, $2, now(), 'cash-in-empty') RETURNING *`
   const sql2 = ` 
     UPDATE bills SET cashbox_batch_id=$1
diff --git a/lib/routes/cashboxRoutes.js b/lib/routes/cashboxRoutes.js
index 3db8e284..40e83905 100644
--- a/lib/routes/cashboxRoutes.js
+++ b/lib/routes/cashboxRoutes.js
@@ -5,12 +5,11 @@ const cashbox = require('../cashbox-batches')
 const machine = require('../machine-loader')
 
 function notifyCashboxRemoval (req, res, next) {
-  Promise.resolve()
-    .then(() => machine.getMachine(req.deviceId))
+  return machine.getMachine(req.deviceId)
     .then(machine => cashbox.createCashboxBatch(req.deviceId, machine.cashbox))
-    .then(() => machine.emptyCashInBills(req))
+    .then(() => machine.setMachine({ deviceId: req.deviceId, action: 'emptyCashInBills' }))
     .then(() => res.status(200).send({ status: 'OK' }))
-    .catch(next)
+    .catch(next)    
 }
 
 router.post('/removal', notifyCashboxRemoval)