diff --git a/lib/webserver.js b/lib/webserver.js
index e1a0a95f..e006ada6 100644
--- a/lib/webserver.js
+++ b/lib/webserver.js
@@ -138,10 +138,10 @@ function loadPem(locations, type, keyrings, pass) {
   let saf = [];
   types.filter(type=> type.startsWith('safkeyring'))
        .forEach((type)=> { saf = saf.concat(locationsByType[type]) });
-  if (saf && os.platform() != 'os390') {
+  if (saf.length > 0 && os.platform() != 'os390') {
     bootstrapLogger.severe('ZWED0145E');//Cannot load SAF keyring content outside of z/OS'
     process.exit(constants.EXIT_NO_SAFKEYRING);
-  } else if (saf && keyring_js) {
+  } else if (saf.length > 0 && keyring_js) {
     saf.forEach((safEntry)=> {
       /*
         In the latest code it's possible the entry could start with
@@ -181,7 +181,7 @@ function loadPem(locations, type, keyrings, pass) {
                              userId, keyringName, label);
       }
     });
-  } else if (saf && !keyring_js) {
+  } else if (saf.length > 0 && !keyring_js) {
     //Cannot load SAF keyring due to missing keyring_js library');
     bootstrapLogger.warn('ZWED0150E');
   }
diff --git a/test/webapp/websocket/package-lock.json b/test/webapp/websocket/package-lock.json
index 3665e916..45ef421a 100644
--- a/test/webapp/websocket/package-lock.json
+++ b/test/webapp/websocket/package-lock.json
@@ -244,4 +244,4 @@
       "requires": {}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/webapp/websocket/package.json b/test/webapp/websocket/package.json
index e67b0e96..d48523b9 100644
--- a/test/webapp/websocket/package.json
+++ b/test/webapp/websocket/package.json
@@ -11,4 +11,4 @@
     "utf-8-validate": "^5.0.2",
     "ws": "^7.4.6"
   }
-}
+}
\ No newline at end of file