diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/GlobalExceptionHandler.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/GlobalExceptionHandler.java
index 8b431b54..e6ee9234 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/GlobalExceptionHandler.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/GlobalExceptionHandler.java
@@ -25,6 +25,7 @@ import org.springframework.security.authorization.AuthorizationDeniedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {
@@ -49,6 +50,7 @@ public class GlobalExceptionHandler {
         return new Response<>(ex.getErrors(), ex.getStatus(), ex.getMessage());
     }
 
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<Response<Void>> handleResourceNotFoundException(ResourceNotFoundException ex) {
         log.error(ex.getMessage());
@@ -178,5 +180,14 @@ public class GlobalExceptionHandler {
         String exceptionString = ex.getMessage().substring(ex.getMessage().indexOf("]: [") + 4, ex.getMessage().length() - 1);
         return Utils.convertIntoJson(exceptionString);
     }
-    
+
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ResponseEntity<Response<Void>> handlNoeResourceNotFoundException(NoResourceFoundException ex) {
+        log.error(ex.getMessage());
+//        log.error(ex.getLocalizedMessage(), ex);
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                .body(new Response<>(null,  Status.NOT_FOUND, ex.getMessage()));
+    }
+
 }