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 5958708..d15ad63 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
@@ -107,15 +107,16 @@
 
     @Override
     public void registerProperties(Class<?> componentClass) {
-        if (true) {
-            return;
-        }
-
         checkPermission(CONFIG_WRITE);
 
         String componentName = componentClass.getName();
         String resourceName = componentClass.getSimpleName() + RESOURCE_EXT;
         try (InputStream ris = componentClass.getResourceAsStream(resourceName)) {
+            // FIXME: Eliminate the following soft-fail after property refactoring is complete.
+            if (ris == null) {
+                log.info("Property definitions not found at resource {}; please fix this", resourceName);
+                return;
+            }
             checkArgument(ris != null, "Property definitions not found at resource %s",
                           resourceName);