diff --git a/src/main/java/kbank/gateway/CommandKafkaProducer.java b/src/main/java/kbank/gateway/CommandKafkaProducer.java
index 6b1f7a9..4bfb23e 100644
--- a/src/main/java/kbank/gateway/CommandKafkaProducer.java
+++ b/src/main/java/kbank/gateway/CommandKafkaProducer.java
@@ -10,6 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.ExecutionException;
+
 public class CommandKafkaProducer {
 
     private KafkaProducer<String, JsonNode> kafkaProducer;
@@ -36,9 +38,9 @@ public void send(final Command command) {
                     (JsonNode) jsonCmd
             );
 
-            kafkaProducer.send(record);
+            kafkaProducer.send(record).get();
             kafkaProducer.commitTransaction();
-        } catch (KafkaException e) {
+        } catch (InterruptedException | ExecutionException | KafkaException e) {
             log.error("Kafka Producer error", e);
             kafkaProducer.abortTransaction();
         }