diff --git a/src/addons.js b/src/addons.js
index f0bcc124e..b430495e9 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -364,7 +364,7 @@ function getService(serviceName, callback) {
         }
 
         KNOWN_SERVICES[serviceName].status(function (error, result) {
-            if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
+            if (error) return callback(error);
 
             tmp.status = result.status;
             tmp.memoryUsed = result.memoryUsed;
@@ -1779,7 +1779,7 @@ function statusSftp(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     docker.inspect('sftp', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
+        if (error && error.reason === DockerError.NOT_FOUND) return callback(null, { status: exports.SERVICE_STATUS_STOPPED });
         if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
         docker.memoryUsage('sftp', function (error, result) {
@@ -1800,7 +1800,7 @@ function statusGraphite(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     docker.inspect('graphite', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
+        if (error && error.reason === DockerError.NOT_FOUND) return callback(null, { status: exports.SERVICE_STATUS_STOPPED });
         if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
         request.get('http://127.0.0.1:8417/graphite-web/dashboard', { timeout: 3000 }, function (error, response) {