diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java
index 168eed5..7ac70ab 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java
@@ -64,7 +64,7 @@
         if (this == obj) {
             return true;
         }
-        if (obj instanceof Ofdpa3MatchOvid) {
+        if (obj != null && obj.getClass() == Ofdpa3MatchOvid.class) {
             Ofdpa3MatchOvid that = (Ofdpa3MatchOvid) obj;
             return Objects.equals(this.vlanId(), that.vlanId());
 
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java
index c1226b0..9a54871 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java
@@ -88,7 +88,7 @@
         if (this == obj) {
             return true;
         }
-        if (obj instanceof OfdpaMatchVlanVid) {
+        if (obj != null && obj.getClass() == OfdpaMatchVlanVid.class) {
             OfdpaMatchVlanVid that = (OfdpaMatchVlanVid) obj;
             return Objects.equals(vlanId, that.vlanId);