diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
index 51cffcd..85e94e9 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
@@ -636,6 +636,10 @@
     {
         Dictionary props = config.getProperties();
         Map adMap = (mtss != null) ? mtss.getAttributeDefinitionMap(config, null) : null;
+        if (null == adMap)
+        {
+          return null;
+        }
 
         // check for configured name hint template
         String nameHint = getConfigurationPropertyValueOrDefault(PROPERTY_FACTORYCONFIG_NAMEHINT, props, adMap);