diff --git a/src/main/java/com/podzilla/warehouse/Events/EmptyEventHandler.java b/src/main/java/com/podzilla/warehouse/Events/EmptyEventHandler.java
new file mode 100644
index 0000000..6b640f5
--- /dev/null
+++ b/src/main/java/com/podzilla/warehouse/Events/EmptyEventHandler.java
@@ -0,0 +1,12 @@
+package com.podzilla.warehouse.Events;
+
+import com.podzilla.mq.events.BaseEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EmptyEventHandler implements EventHandler<BaseEvent> {
+    @Override
+    public void handle(BaseEvent event) {
+        // Empty implementation - does nothing
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/podzilla/warehouse/Events/EventHandlerFactory.java b/src/main/java/com/podzilla/warehouse/Events/EventHandlerFactory.java
index 6322157..f87d4e8 100644
--- a/src/main/java/com/podzilla/warehouse/Events/EventHandlerFactory.java
+++ b/src/main/java/com/podzilla/warehouse/Events/EventHandlerFactory.java
@@ -12,11 +12,14 @@
 @Component
 public class EventHandlerFactory {
     private final HashMap<Class<? extends BaseEvent>, EventHandler<? extends BaseEvent>> handlers;
+    private final EmptyEventHandler emptyEventHandler;
 
     @Autowired
     public EventHandlerFactory(OrderPlacedEventHandler OrderPlacedEventHandler,
                                OrderStockReservationEventHandler orderStockReservationEventHandler,
-                               OrderCancelledEventHandler orderCancelledEventHandler) {
+                               OrderCancelledEventHandler orderCancelledEventHandler,
+                               EmptyEventHandler emptyEventHandler) {
+        this.emptyEventHandler = emptyEventHandler;
         handlers = new HashMap<>();
         handlers.put(OrderPlacedEvent.class, OrderPlacedEventHandler);
         handlers.put(OrderStockReservationRequestedEvent.class, orderStockReservationEventHandler);
@@ -27,7 +30,7 @@ public EventHandlerFactory(OrderPlacedEventHandler OrderPlacedEventHandler,
     public <T extends BaseEvent> EventHandler<T> getHandler(T event) {
         EventHandler<? extends BaseEvent> handler = handlers.get(event.getClass());
         if (handler == null) {
-            throw new IllegalArgumentException("No handler found for event type: " + event.getClass().getName());
+            return (EventHandler<T>) emptyEventHandler;
         }
         return (EventHandler<T>) handler;
     }