diff --git a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
index 011733c185..21a54b39a9 100644
--- a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
+++ b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
@@ -379,6 +379,11 @@ public class ComponentConfigManager implements ComponentConfigService {
         try {
             Configuration cfg = cfgAdmin.getConfiguration(componentName, null);
             Map<String, ConfigProperty> map = properties.get(componentName);
+            if (map == null) {
+                //  Prevent NPE if the component isn't there
+                log.warn("Component not found for " + componentName);
+                return;
+            }
             Dictionary<String, Object> props = new Hashtable<>();
             map.values().stream().filter(p -> p.value() != null)
                     .forEach(p -> props.put(p.name(), p.value()));