diff --git a/src/main/java/ru/soune/no_copy/controller/ApiController.java b/src/main/java/ru/soune/no_copy/controller/ApiController.java
index 8d6a646..7986e11 100644
--- a/src/main/java/ru/soune/no_copy/controller/ApiController.java
+++ b/src/main/java/ru/soune/no_copy/controller/ApiController.java
@@ -45,19 +45,20 @@ public class ApiController {
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
         Integer msgId = request.getMsgId();
+        BaseResponse response;
 
         try {
             RequestHandler handler = handlers.get(msgId);
 
             if (handler == null) {
-                new BaseResponse(msgId,
+                response = new BaseResponse(msgId,
                         MessageCode.MSG_ID_NOT_FOUND.getCode(),
                         MessageCode.MSG_ID_NOT_FOUND.getDescription(),
                         new HashMap<>());
+            } else {
+                response = handler.handle(request);
             }
 
-            BaseResponse response = handler.handle(request);
-
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
diff --git a/src/main/java/ru/soune/no_copy/dto/MessageCode.java b/src/main/java/ru/soune/no_copy/dto/MessageCode.java
index 5359d44..75fb869 100644
--- a/src/main/java/ru/soune/no_copy/dto/MessageCode.java
+++ b/src/main/java/ru/soune/no_copy/dto/MessageCode.java
@@ -2,12 +2,12 @@ package ru.soune.no_copy.dto;
 
 public enum MessageCode {
     SUCCESS(0, "Operation successful"),
-    REG_EMAIL_EXISTS(2001, "Email already registered"),
-    INVALID_FIELD(2002, "Invalid field"),
-    MSG_ID_NOT_FOUND(2004, "Message id not found"),
+    REG_EMAIL_EXISTS(4001, "Email already registered"),
+    INVALID_FIELD(4002, "Invalid field"),
+    MSG_ID_NOT_FOUND(4003, "Message id not found"),
 
-    AUTH_EMAIL_NOT_FOUND(2005, "Email not found"),
-    AUTH_PASSWORD_NOT_MATCHES(2006, "Password does not match");
+    AUTH_EMAIL_NOT_FOUND(4005, "Email not found"),
+    AUTH_PASSWORD_NOT_MATCHES(4006, "Password does not match");
 
     private final Integer code;