diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
index b3fb034..32c1ad9 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingDhcpHandler.java
@@ -285,6 +285,7 @@
             if (osPort == null) {
                 log.error("Failed to retrieve openstack port information for instance port {}",
                         reqInstPort.toString());
+                return null;
             }
             // pick one IP address to make a reply
             IP fixedIp = osPort.getFixedIps().stream().findFirst().get();