From a88ab822612b172fd2516f4b9153d38dfff64879 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 30 May 2018 11:02:01 -0400
Subject: [PATCH] conflict in blockchain.js

---
 lib/contracts/blockchain.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js
index 895860e13..76c995fa7 100644
--- a/lib/contracts/blockchain.js
+++ b/lib/contracts/blockchain.js
@@ -109,13 +109,14 @@ class Blockchain {
 
   registerServiceCheck() {
     const self = this;
+    const NO_NODE = 'noNode';
 
     this.addCheck('Ethereum', function (cb) {
       async.waterfall([
         function checkNodeConnection(next) {
           self.assertNodeConnection(true, (err) => {
             if (err) {
-              return next(true, {name: "No Blockchain node found", status: 'off'});
+              return next(NO_NODE, {name: "No Blockchain node found", status: 'off'});
             }
             next();
           });
@@ -137,9 +138,8 @@ class Blockchain {
           });
         }
       ], (err, statusObj) => {
-        if (err && err !== true) {
-          self.logger.error(err);
-          return;
+        if (err && err !== NO_NODE) {
+          return cb(err);
         }
         cb(statusObj);
       });