diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 89893a2f806..2bb1596ed1c 100644
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -847,7 +847,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             return true;
         }
 
-        long clusterId = host.getClusterId();
+        Long clusterId = host.getClusterId();
 
         _agentMgr.notifyMonitorsOfHostAboutToBeRemoved(host.getId());
 
@@ -927,7 +927,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             }
         });
 
-        _agentMgr.notifyMonitorsOfRemovedHost(host.getId(), clusterId);
+        if (clusterId != null) {
+            _agentMgr.notifyMonitorsOfRemovedHost(host.getId(), clusterId);
+        }
 
         return true;
     }
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 642370feb2a..2eef6b1908d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13256,7 +13256,7 @@
                             dataType: "json",
                             async: false,
                             success: function(json) {
-                                var items = json.listnuagevspdeviceresponse.nuagevspdevice;
+                                var items = json.listnuagevspdevicesresponse.nuagevspdevice;
                                 args.response.success({
                                     data: items
                                 });
@@ -13325,7 +13325,7 @@
                                         dataType: "json",
                                         async: true,
                                         success: function(json) {
-                                            var item = json.listnuagevspdeviceresponse.nuagevspdevice[0];
+                                            var item = json.listnuagevspdevicesresponse.nuagevspdevice[0];
                                             args.response.success({
                                                 data: item
                                             });