diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
index f06c0b4..0127f43 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
@@ -85,10 +85,12 @@
         Device dev = deviceService.getDevice(deviceId);
         if (dev == null) {
             log.error("Device {} does not exist", deviceId);
+            return ImmutableSet.of();
         }
         Port p = deviceService.getPort(dev.id(), port);
         if (p == null) {
             log.error("Port {} does not exist", port);
+            return ImmutableSet.of();
         }
         String uuid = p.annotations().value(port.toString());