diff --git a/api/services/KongProxyHooks.js b/api/services/KongProxyHooks.js
index 13500d7cf..2e3722a54 100644
--- a/api/services/KongProxyHooks.js
+++ b/api/services/KongProxyHooks.js
@@ -190,6 +190,10 @@ var self = module.exports = {
const existingUpstreamIds = _.map(resBody.data, item => item.id);
sails.log("KongProxyHooks:upstreams:afterList:existingUpstreamIds", existingUpstreamIds);
+ if(!existingUpstreamIds.length) {
+ return next();
+ }
+
// Check if there are any alerts that do not match
// the exiting upstream ids
sails.models.upstreamalert.find({
diff --git a/package.json b/package.json
index a4710576b..72124c400 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "kongadmin",
- "version": "0.14.1-rc10",
+ "version": "0.14.1-rc11",
"description": "Kong admin GUI",
"keywords": [
"sails.js",
diff --git a/views/layout.ejs b/views/layout.ejs
index a97a24826..a70eaade2 100644
--- a/views/layout.ejs
+++ b/views/layout.ejs
@@ -30,15 +30,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -100,209 +100,209 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<% }%>