diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
index cdc6b32..2eb0b6a 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/FpcRpcManager.java
@@ -245,7 +245,7 @@
 
                 // get DPN Topic from Node/Network pair
                 byte topic_id = getTopicFromNode(key.get());
-                if (topic_id == -1) {
+                if (topic_id == -1 && dpnCommunicationService instanceof ZmqDpnControlProtocol) {
                     throw new RuntimeException("Could not find Topic ID");
                 }
 
@@ -411,7 +411,7 @@
 
                 // get DPN Topic from Node/Network pair
                 byte topic_id = getTopicFromNode(key.get());
-                if (topic_id == -1) {
+                if (topic_id == -1 && dpnCommunicationService instanceof ZmqDpnControlProtocol) {
                     throw new RuntimeException("Could not find Topic ID");
                 }
 
@@ -561,7 +561,7 @@
 
                 // find DPN Topic from Node/Network ID pair.
                 byte topic_id = getTopicFromNode(key.get());
-                if (topic_id == -1) {
+                if (topic_id == -1 && dpnCommunicationService instanceof ZmqDpnControlProtocol) {
                     throw new RuntimeException("Could not find Topic ID");
                 }