diff --git a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
index 05cbc57..a7334c6 100644
--- a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
+++ b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
@@ -161,7 +161,7 @@
     public DataNode getDataNode() {
         ResourceData rData = toResourceData(getModelObjectData());
         if (rData.dataNodes().size() > 1) {
-            throw new RuntimeException("Multiple dataNode found.");
+            throw new IllegalStateException("Multiple dataNode found.");
         }
         return rData.dataNodes().get(0);
     }
@@ -232,7 +232,7 @@
         ResourceData rData = toResourceData(rNode, rId);
         ModelObjectData modelObjectData = modelConverter.createModel(rData);
         if (modelObjectData.modelObjects().size() > 1) {
-            throw new RuntimeException("Multiple modelObject found.");
+            throw new IllegalStateException("Multiple modelObject found.");
         }
         return (T) modelObjectData.modelObjects().get(0);
     }