diff --git a/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java b/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
index a1abd18..bff4195 100644
--- a/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
+++ b/core/api/src/test/java/org/onosproject/cfg/ComponentConfigAdapter.java
@@ -17,10 +17,13 @@
 
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Adapter for testing against component configuration service.
  */
 public class ComponentConfigAdapter implements ComponentConfigService {
+
     @Override
     public Set<String> getComponentNames() {
         return null;
@@ -38,7 +41,7 @@
 
     @Override
     public Set<ConfigProperty> getProperties(String componentName) {
-        return null;
+        return ImmutableSet.of();
     }
 
     @Override