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;
-            }
         }
     }