3 files changed, 18 insertions, 10 deletions

diff --git a/server/helpers/peertube-crypto.js b/server/helpers/peertube-crypto.js
index ef6808d5c..55ae6fab3 100644
--- a/server/helpers/peertube-crypto.js
+++ b/server/helpers/peertube-crypto.js
@@ -74,7 +74,9 @@ function comparePassword (plainPassword, hashPassword, callback) {
 }
 
 function createCertsIfNotExist (callback) {
-  certsExist(function (exist) {
+  certsExist(function (err, exist) {
+    if (err) return callback(err)
+
     if (exist === true) {
       return callback(null)
     }
@@ -113,13 +115,17 @@ module.exports = peertubeCrypto
 
 function certsExist (callback) {
   const certPath = pathUtils.join(constants.CONFIG.STORAGE.CERT_DIR, constants.PRIVATE_CERT_NAME)
-  fs.exists(certPath, function (exists) {
-    return callback(exists)
+  fs.access(certPath, function (err) {
+    // If there is an error the certificates do not exist
+    const exists = !err
+    return callback(null, exists)
   })
 }
 
 function createCerts (callback) {
-  certsExist(function (exist) {
+  certsExist(function (err, exist) {
+    if (err) return callback(err)
+
     if (exist === true) {
       const string = 'Certs already exist.'
       logger.warning(string)
diff --git a/server/lib/base-request-scheduler.js b/server/lib/base-request-scheduler.js
index 4709c7960..7378971c8 100644
--- a/server/lib/base-request-scheduler.js
+++ b/server/lib/base-request-scheduler.js
@@ -66,10 +66,10 @@ module.exports = class BaseRequestScheduler {
         err = err ? err.message : 'Status code not 20x : ' + res.statusCode
         logger.error('Error sending secure request to %s pod.', toPod.host, { error: err })
 
-        return callback(false)
+        return callback(err)
       }
 
-      return callback(true)
+      return callback(null)
     })
   }
 
@@ -99,8 +99,8 @@ module.exports = class BaseRequestScheduler {
         const requestToMake = requestsToMakeGrouped[hashKey]
         const toPod = requestToMake.toPod
 
-        this.makeRequest(toPod, requestToMake.endpoint, requestToMake.datas, (success) => {
-          if (success === false) {
+        this.makeRequest(toPod, requestToMake.endpoint, requestToMake.datas, (err) => {
+          if (err) {
             badPods.push(requestToMake.toPod.id)
             return callbackEach()
           }
diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index 21f0732d0..3ac13f053 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -102,7 +102,9 @@ runServers(numberOfPods, function (err, servers) {
     checking = true
 
     const waitingInterval = setInterval(function () {
-      isThereAwaitingRequests(servers, function (res) {
+      isThereAwaitingRequests(servers, function (err, res) {
+        if (err) throw err
+
         if (res === true) {
           console.log('A server has awaiting requests, waiting...')
           return
@@ -360,6 +362,6 @@ function isThereAwaitingRequests (servers, callback) {
   }, function (err) {
     if (err) throw err
 
-    return callback(noRequests === false)
+    return callback(null, noRequests === false)
   })
 }