diff --git a/src/main/java/io/odpf/sink/connectors/bigquery/handler/ErrorHandler.java b/src/main/java/io/odpf/sink/connectors/bigquery/handler/ErrorHandler.java
index ea29b916..c219e58c 100644
--- a/src/main/java/io/odpf/sink/connectors/bigquery/handler/ErrorHandler.java
+++ b/src/main/java/io/odpf/sink/connectors/bigquery/handler/ErrorHandler.java
@@ -7,5 +7,6 @@
 import java.util.Map;
 
 public interface ErrorHandler {
-    void handle(Map<Long, List<BigQueryError>> errorInfoMap, List<Record> records);
+    default void handle(Map<Long, List<BigQueryError>> errorInfoMap, List<Record> records) {
+    }
 }
diff --git a/src/main/java/io/odpf/sink/connectors/bigquery/handler/NoopErrorHandler.java b/src/main/java/io/odpf/sink/connectors/bigquery/handler/NoopErrorHandler.java
index 1039f4d4..20e6e118 100644
--- a/src/main/java/io/odpf/sink/connectors/bigquery/handler/NoopErrorHandler.java
+++ b/src/main/java/io/odpf/sink/connectors/bigquery/handler/NoopErrorHandler.java
@@ -1,16 +1,7 @@
 package io.odpf.sink.connectors.bigquery.handler;
 
-import com.google.cloud.bigquery.BigQueryError;
-import io.odpf.sink.connectors.bigquery.models.Record;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-import java.util.Map;
-
 @Slf4j
 public class NoopErrorHandler implements ErrorHandler {
-    @Override
-    public void handle(Map<Long, List<BigQueryError>> errorInfoMap, List<Record> records) {
-
-    }
 }
diff --git a/src/main/java/io/odpf/sink/connectors/message/OdpfMessage.java b/src/main/java/io/odpf/sink/connectors/message/OdpfMessage.java
index 25cde235..9aed0ad4 100644
--- a/src/main/java/io/odpf/sink/connectors/message/OdpfMessage.java
+++ b/src/main/java/io/odpf/sink/connectors/message/OdpfMessage.java
@@ -2,6 +2,7 @@
 
 import io.odpf.sink.connectors.common.Tuple;
 import io.odpf.sink.connectors.common.TupleString;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 import java.util.Arrays;
@@ -12,6 +13,7 @@
 
 
 @Getter
+@EqualsAndHashCode
 public class OdpfMessage {
     private final Object logKey;
     private final Object logMessage;