diff --git a/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java b/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
index 315d570..cba39fe 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
@@ -226,10 +226,11 @@
             if (Objects.equals(subject, k.subject) && k.configClass != null && delegate != null) {
                 ConfigFactory<S, ? extends Config<S>> configFactory = factoriesByConfig.get(k.configClass);
                 if (configFactory == null) {
-                    log.error("Found config but no config factory: subject={}, configClass={}",
-                            subject, k.configClass);
+                    log.warn("Found config but no config factory: subject={}, configClass={}",
+                             subject, k.configClass);
+                } else {
+                    builder.add(configFactory.configClass());
                 }
-                builder.add(factoriesByConfig.get(k.configClass).configClass());
             }
         });
         return builder.build();
