diff --git a/src/addons.js b/src/addons.js
index 38d2bd4a2..5d1632180 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -38,7 +38,6 @@ var accesscontrol = require('./accesscontrol.js'),
     clients = require('./clients.js'),
     constants = require('./constants.js'),
     crypto = require('crypto'),
-    DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:addons'),
     docker = require('./docker.js'),
     dockerConnection = docker.connection,
@@ -942,7 +941,7 @@ function setupRecvMail(app, options, callback) {
     debugApp(app, 'Setting up recvmail');
 
     appdb.getAddonConfigByName(app.id, 'recvmail', '%MAIL_IMAP_PASSWORD', function (error, existingPassword) {
-        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
+        if (error && error.reason !== BoxError.NOT_FOUND) return callback(error);
 
         var password = error ? hat(4 * 48) : existingPassword;  // see box#565 for password length
 
diff --git a/src/tasks.js b/src/tasks.js
index de2aa0409..ad0cadf62 100644
--- a/src/tasks.js
+++ b/src/tasks.js
@@ -41,7 +41,6 @@ let assert = require('assert'),
     async = require('async'),
     BoxError = require('./boxerror.js'),
     child_process = require('child_process'),
-    DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:tasks'),
     paths = require('./paths.js'),
     safe = require('safetydance'),