diff --git a/js/common/tests/shell/shell-general-graph.js b/js/common/tests/shell/shell-general-graph.js
index dabbf2fd2e..41595ccf8c 100644
--- a/js/common/tests/shell/shell-general-graph.js
+++ b/js/common/tests/shell/shell-general-graph.js
@@ -33,6 +33,7 @@ var arangodb = require("@arangodb");
 var db = arangodb.db;
 var graph = require("@arangodb/general-graph");
 var cluster;
+var isOnServer = (typeof ArangoClusterComm === "object");
 if (isOnServer) {
   cluster = require("@arangodb/cluster");
 } else {
diff --git a/js/server/modules/@arangodb/cluster.js b/js/server/modules/@arangodb/cluster.js
index fb1a482fe1..6803e0e84d 100644
--- a/js/server/modules/@arangodb/cluster.js
+++ b/js/server/modules/@arangodb/cluster.js
@@ -43,7 +43,7 @@ var endpointToURL = function (endpoint) {
     return "http://" + endpoint;
   }
   return "http" + endpoint.substr(pos);
-}
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief create a unique identifier