diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
index c90571f..141af0b 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DistributedOpenstackVtapStore.java
@@ -383,10 +383,14 @@
                                                  DeviceId deviceId) {
         Set<OpenstackVtapId> vtapIds = Sets.newHashSet();
         if (type.isValid(OpenstackVtap.Type.VTAP_TX)) {
-            vtapIds.addAll(vTapIdsByTxDeviceId.get(deviceId));
+            if (vTapIdsByTxDeviceId.get(deviceId) != null) {
+                vtapIds.addAll(vTapIdsByTxDeviceId.get(deviceId));
+            }
         }
         if (type.isValid(OpenstackVtap.Type.VTAP_RX)) {
-            vtapIds.addAll(vTapIdsByRxDeviceId.get(deviceId));
+            if (vTapIdsByRxDeviceId.get(deviceId) != null) {
+                vtapIds.addAll(vTapIdsByRxDeviceId.get(deviceId));
+            }
         }
 
         return ImmutableSet.copyOf(