diff --git a/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java b/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java
index 67bd09f..cc876f9 100644
--- a/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java
+++ b/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java
@@ -7,9 +7,7 @@
 @SpringBootApplication
 @EnableFeignClients
 public class TaskSchedulerApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(TaskSchedulerApplication.class, args);
 	}
-
 }
diff --git a/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java b/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java
index 93072f3..c03cf73 100644
--- a/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java
+++ b/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java
@@ -24,7 +24,6 @@ public class TaskService {
     private final TaskUpdateConverter taskUpdateConverter;
 
     public TaskDTO saveTask(String token, TaskDTO taskDTO) {
-
         taskDTO.setUserEmail(jwtUtil.extractUsername(token.substring(7)));
         taskDTO.setCreationDateTime(LocalDateTime.now());
         taskDTO.setNotificationStatusEnum(NotificationStatusEnum.PENDING);
diff --git a/src/main/java/com/javanauta/ts/taskscheduler/controller/GlobalExceptionHandler.java b/src/main/java/com/javanauta/ts/taskscheduler/controller/GlobalExceptionHandler.java
new file mode 100644
index 0000000..4db8fac
--- /dev/null
+++ b/src/main/java/com/javanauta/ts/taskscheduler/controller/GlobalExceptionHandler.java
@@ -0,0 +1,22 @@
+package com.javanauta.ts.taskscheduler.controller;
+
+import com.javanauta.ts.taskscheduler.infrastructure.exception.ResourceNotFoundException;
+import com.javanauta.ts.taskscheduler.infrastructure.exception.UnauthorizedException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<String> handlerResourceNotFoundException(ResourceNotFoundException ex) {
+        return new ResponseEntity<>(ex.getMessage(), HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(UnauthorizedException.class)
+    public ResponseEntity<String> handlerUnauthorizedException(UnauthorizedException ex) {
+        return new ResponseEntity<>(ex.getMessage(), HttpStatus.UNAUTHORIZED);
+    }
+}
diff --git a/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/UnauthorizedException.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/UnauthorizedException.java
new file mode 100644
index 0000000..1cd3323
--- /dev/null
+++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/UnauthorizedException.java
@@ -0,0 +1,13 @@
+package com.javanauta.ts.taskscheduler.infrastructure.exception;
+
+import org.springframework.security.core.AuthenticationException;
+
+public class UnauthorizedException extends AuthenticationException {
+    public UnauthorizedException(String message) {
+        super(message);
+    }
+
+    public UnauthorizedException(String message, Throwable throwable) {
+        super(message, throwable);
+    }
+}