diff --git a/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/signal/KafkaSignalThread.java b/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/signal/KafkaSignalThread.java
index abea6ee9a..546310d9a 100644
--- a/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/signal/KafkaSignalThread.java
+++ b/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/signal/KafkaSignalThread.java
@@ -136,7 +136,7 @@ private void monitorSignals() {
                     return;
                 }
                 catch (final Exception e) {
-                    Throwables.logErrorAndTraceRecord(LOGGER, "Skipped signal due to an error", e, record);
+                    Throwables.logErrorAndTraceRecord(LOGGER, record, "Skipped signal due to an error", e);
                 }
             }
         }
diff --git a/debezium-core/src/main/java/io/debezium/connector/base/ChangeEventQueue.java b/debezium-core/src/main/java/io/debezium/connector/base/ChangeEventQueue.java
index fbf5dee90..9cf468976 100644
--- a/debezium-core/src/main/java/io/debezium/connector/base/ChangeEventQueue.java
+++ b/debezium-core/src/main/java/io/debezium/connector/base/ChangeEventQueue.java
@@ -205,7 +205,7 @@ public void disableBuffering() {
     }
 
     protected void doEnqueue(T record) throws InterruptedException {
-        if (LOGGER.isDebugEnabled()) {
+        if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Enqueuing source record '{}'", record);
         }
 
diff --git a/debezium-core/src/main/java/io/debezium/util/Throwables.java b/debezium-core/src/main/java/io/debezium/util/Throwables.java
index e372b6348..3c017de80 100644
--- a/debezium-core/src/main/java/io/debezium/util/Throwables.java
+++ b/debezium-core/src/main/java/io/debezium/util/Throwables.java
@@ -27,8 +27,13 @@ public static Throwable getRootCause(Throwable throwable) {
         }
     }
 
-    public static void logErrorAndTraceRecord(Logger logger, String message, Exception e, Object record) {
+    public static void logErrorAndTraceRecord(Logger logger, Object record, String message, Throwable e) {
         logger.error(message, e);
-        LOGGER.trace("Source of error is {}", record);
+        LOGGER.trace("Source of error is record '{}'", record);
+    }
+
+    public static void logErrorAndTraceRecord(Logger logger, Object record, String message, Object... arguments) {
+        logger.error(message, arguments);
+        LOGGER.trace("Source of error is record '{}'", record);
     }
 }
diff --git a/debezium-server/debezium-server-redis/src/main/java/io/debezium/server/redis/RedisSchemaHistory.java b/debezium-server/debezium-server-redis/src/main/java/io/debezium/server/redis/RedisSchemaHistory.java
index 47255690b..847b8d929 100644
--- a/debezium-server/debezium-server-redis/src/main/java/io/debezium/server/redis/RedisSchemaHistory.java
+++ b/debezium-server/debezium-server-redis/src/main/java/io/debezium/server/redis/RedisSchemaHistory.java
@@ -14,7 +14,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
-import io.debezium.util.Throwables;
 import org.apache.kafka.connect.errors.ConnectException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +31,7 @@
 import io.debezium.relational.history.SchemaHistoryListener;
 import io.debezium.util.Collect;
 import io.debezium.util.DelayStrategy;
+import io.debezium.util.Throwables;
 
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.StreamEntryID;
@@ -151,7 +151,7 @@ protected void storeRecord(HistoryRecord record) throws SchemaHistoryException {
             line = writer.write(record.document());
         }
         catch (IOException e) {
-            Throwables.logErrorAndTraceRecord(LOGGER, "Failed to convert record to string", e, record);
+            Throwables.logErrorAndTraceRecord(LOGGER, record, "Failed to convert record to string", e);
             throw new SchemaHistoryException("Unable to write database schema history record");
         }
 
diff --git a/debezium-storage/debezium-storage-file/src/main/java/io/debezium/storage/file/history/FileSchemaHistory.java b/debezium-storage/debezium-storage-file/src/main/java/io/debezium/storage/file/history/FileSchemaHistory.java
index 48fd262b7..eb6a1d0a8 100644
--- a/debezium-storage/debezium-storage-file/src/main/java/io/debezium/storage/file/history/FileSchemaHistory.java
+++ b/debezium-storage/debezium-storage-file/src/main/java/io/debezium/storage/file/history/FileSchemaHistory.java
@@ -125,7 +125,7 @@ protected void storeRecord(HistoryRecord record) throws SchemaHistoryException {
                         historyWriter.newLine();
                     }
                     catch (IOException e) {
-                        Throwables.logErrorAndTraceRecord(logger, "Failed to add record to history at " + path, e, record);
+                        Throwables.logErrorAndTraceRecord(logger, record, "Failed to add record to history at {}", path, e);
                         return;
                     }
                 }
@@ -134,7 +134,7 @@ protected void storeRecord(HistoryRecord record) throws SchemaHistoryException {
                 }
             }
             catch (IOException e) {
-                Throwables.logErrorAndTraceRecord(logger, "Failed to convert record to string", e, record);
+                Throwables.logErrorAndTraceRecord(logger, record, "Failed to convert record to string", e);
             }
         });
     }
diff --git a/debezium-storage/debezium-storage-kafka/src/main/java/io/debezium/storage/kafka/history/KafkaSchemaHistory.java b/debezium-storage/debezium-storage-kafka/src/main/java/io/debezium/storage/kafka/history/KafkaSchemaHistory.java
index 8eec4dc97..33a43bdff 100644
--- a/debezium-storage/debezium-storage-kafka/src/main/java/io/debezium/storage/kafka/history/KafkaSchemaHistory.java
+++ b/debezium-storage/debezium-storage-kafka/src/main/java/io/debezium/storage/kafka/history/KafkaSchemaHistory.java
@@ -345,10 +345,10 @@ protected void recoverRecords(Consumer<HistoryRecord> records) {
                         }
                     }
                     catch (final IOException e) {
-                        Throwables.logErrorAndTraceRecord(LOGGER, "Error while deserializing history record", e, record);
+                        Throwables.logErrorAndTraceRecord(LOGGER, record, "Error while deserializing history record", e);
                     }
                     catch (final Exception e) {
-                        Throwables.logErrorAndTraceRecord(LOGGER, "Unexpected exception while processing record", e, record);
+                        Throwables.logErrorAndTraceRecord(LOGGER, record, "Unexpected exception while processing record", e);
                         throw e;
                     }
                 }