From 88beadb445798507733e0f264eae1995523f6a82 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Wed, 15 Mar 2023 00:01:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simple/core/GeneralAutoResponder.java         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java
index 14cd7b5..8a3a297 100644
--- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java
+++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java
@@ -151,15 +151,16 @@ public class GeneralAutoResponder<M extends Message> {
     }
 
     public void answer(UnitRequest<MainUnit<M>, M> unitRequest) {
-        try {
+        if (checkNotNull(errorHandler)) {
+            try {
+                unitRequest = getAction(unitRequest);
+                activeUnitAfter(unitRequest);
+            } catch (Exception e) {
+                errorHandler.handle(unitRequest.getMessage(), e);
+            }
+        } else {
             unitRequest = getAction(unitRequest);
             activeUnitAfter(unitRequest);
-        } catch (Exception e) {
-            if (checkNotNull(errorHandler)) {
-                errorHandler.handle(unitRequest.getMessage(), e);
-            } else {
-                throw e;
-            }
         }
     }