--- a/src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java	Thu Dec 28 20:05:03 2017 +0530
+++ b/src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java	Thu Dec 28 20:34:32 2017 +0530
@@ -62,7 +62,7 @@
             // Return true for MXbean
             Descriptor desc = mInfo.getDescriptor();
             String isMxBean = (String) desc.getFieldValue("mxbean");
-            if (isMxBean.equalsIgnoreCase("true"))
+            if (isMxBean != null && isMxBean.equalsIgnoreCase("true"))
                 return true;
 
             // Check attribute types
@@ -188,7 +188,7 @@
 
             Map<String, String> properties = new HashMap<>();
 
-            properties.put("mbeanCount", Integer.toString(filteredMBeans.size()));
+            properties.put("mbeanCount", Integer.toString(allowedMbeans.size()));
 
             JSONMapper typeMapper1 = JSONMappingFactory.INSTANCE.getTypeMapper(items);
             JSONMapper typeMapper2 = JSONMappingFactory.INSTANCE.getTypeMapper(properties);