diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
index d88e132..7950bee 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
@@ -132,7 +132,7 @@
      */
     public static int hostCompareIp(Host host1, Host host2, IpPrefix ipPrefix) {
         if ((host1 == null || host1.ipAddresses().stream().noneMatch(ipPrefix::contains)) &&
-                (host2 != null || host2.ipAddresses().stream().anyMatch(ipPrefix::contains))) {
+                (host2 == null || host2.ipAddresses().stream().anyMatch(ipPrefix::contains))) {
             return -1;
         } else if ((host1 != null && host1.ipAddresses().stream().anyMatch(ipPrefix::contains)) &&
                 (host2 == null || host2.ipAddresses().stream().noneMatch(ipPrefix::contains))) {
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java
index 520a33a..b667dab 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java
@@ -71,7 +71,7 @@
         } else if (vPortId == null && networkId == null && deviceId == null && tenantId != null) {
             Collection<VirtualPort> ports = service.getPorts(DeviceId.deviceId(tenantId));
             printPorts(ports);
-        } else if (vPortId == null && networkId == null && deviceId == null && tenantId == null) {
+        } else if (vPortId == null && networkId == null && deviceId == null) {
             Collection<VirtualPort> ports = service.getPorts();
             printPorts(ports);
         } else {