diff --git a/src/domains.js b/src/domains.js index 6dbf5aa1f..f047373b1 100644 --- a/src/domains.js +++ b/src/domains.js @@ -307,6 +307,7 @@ function del(domain, auditSource, callback) { if (domain === settings.adminDomain()) return callback(new BoxError(BoxError.CONFLICT, 'Cannot remove admin domain')); domaindb.del(domain, function (error) { + if (error && error.reason === BoxError.CONFLICT) return callback(new BoxError(BoxError.CONFLICT, 'Could not remove domain. Check if this domain is in use by a mailbox or an app.')); if (error) return callback(error); eventlog.add(eventlog.ACTION_DOMAIN_REMOVE, auditSource, { domain });