From b06ac6e96f87ce444e9e13ae55bf7e5bd29121b7 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 13 Jun 2018 06:34:28 -0700
Subject: [PATCH] behave better when service down [SCT-1075]

---
 bower.json                                    |  2 +-
 src/client/modules/lib/kbaseServiceManager.js | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index 0e9cff0ed..1d6ed52a5 100644
--- a/bower.json
+++ b/bower.json
@@ -37,7 +37,7 @@
       "kbase-knockout-extensions-es6": "0.1.4",
       "kbase-common-ts": "0.18.0",
       "kbase-common-js": "2.16.1",
-      "kbase-common-es6": "0.5.1",
+      "kbase-common-es6": "0.5.2",
       "kbase-sdk-clients-js": "0.5.1",
       "kbase-service-clients-js": "3.3.5",
       "kbase-ui-widget": "1.3.0",
diff --git a/src/client/modules/lib/kbaseServiceManager.js b/src/client/modules/lib/kbaseServiceManager.js
index 75464bef5..447e2b672 100644
--- a/src/client/modules/lib/kbaseServiceManager.js
+++ b/src/client/modules/lib/kbaseServiceManager.js
@@ -49,8 +49,8 @@ define([
                         throw new Error(errorMessage);
                     } else {
                         console.error(errorMessage);
+                        return null;
                     }
-
                 });
         }
 
@@ -70,6 +70,7 @@ define([
                         throw new Error(errorMessage);
                     } else {
                         console.error(errorMessage);
+                        return null;
                     }
                 });
         }
@@ -89,11 +90,18 @@ define([
                                 throw new Error(errorMessage);
                             } else {
                                 console.error(errorMessage);
+                                return null;
                             }
                         }
                     }).then((result) => {
                         let version;
-                        if (serviceConfig.version.propertyPath) {
+                        if (result === null) {
+                            if (!this.throwErrors) {
+                                return null;
+                            } else {
+                                throw new Error('Invalid semver check result: ' + result);
+                            }
+                        } else if (serviceConfig.version.propertyPath) {
                             version = props.getProp(result, serviceConfig.version.propertyPath);
                         } else {
                             version = result;