diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java b/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java
index 5b59f2a5..46643d3a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java
@@ -111,14 +111,12 @@ public class RegionDao {
     }
     public RegionResponseBean getRegionById(Long id) {
         log.info("Fetching region with ID: {}", id);
-        RegionEntity regionEntity = regionRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)));
+        RegionEntity regionEntity = validateRegion(id);
         return convertRegionEntityToRegionResponse(regionEntity);
     }
     public void deleteById(Long id) {
         log.info("Deleting region with ID: {}", id);
-        regionRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)));
+        validateRegion(id);
         regionRepository.deleteById(id);
         log.info("Region deleted with ID: {}", id);
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java
index 200b9916..b3e93971 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java
@@ -99,15 +99,13 @@ public class RoleDao {
     }
     public RoleResponseBean getRoleById(Long id) {
         log.info("Fetching role with ID: {}", id);
-        RoleEntity roleEntity = roleRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.ROLE_NOT_FOUND)));
+        RoleEntity roleEntity = validateRole(id);
         log.info("Role found: {}", roleEntity);
         return convertRoleEntityToRoleResponse(roleEntity);
     }
     public void deleteById(Long id) {
         log.info("Deleting role with ID: {}", id);
-        roleRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.ROLE_NOT_FOUND)));
+        validateRole(id);
         roleRepository.deleteById(id);
         log.info("Role deleted with ID: {}", id);
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
index 79cbf0b0..81033b05 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
@@ -65,8 +65,7 @@ public class UserDao {
 
     public UserResponseBean updateUser(Long userId, UpdateUserReq userReq) {
         log.info("Updating user with ID: {}", userId);
-        UserEntity userEntity = userRepository.findById(userId)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)));
+        UserEntity userEntity=validateUser(userId);
         log.info("Current user details: {}", userEntity);
         log.info("New user details: {}", userReq);
         String newStatus = userReq.getStatus() != null ? userReq.getStatus().getValue() : null;
@@ -123,8 +122,7 @@ public class UserDao {
 
     public UserResponseBean getUserById(Long id) {
         log.info("Fetching user with ID: {}", id);
-        UserEntity userEntity = userRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+        UserEntity userEntity=validateUser(id);
 //        if (!UserStatusEnum.ACTIVE.getValue().equals(userEntity.getStatus())) {
 //            log.info("User with ID: {} is not active", id);
 //            throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG));
@@ -135,8 +133,7 @@ public class UserDao {
 
     public void deleteUser(Long id) {
         log.info("Deleting user with ID: {}", id);
-        userRepository.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+        validateUser(id);
         userRepository.deleteById(id);
         log.info("User deleted with ID: {}", id);
     }
@@ -150,7 +147,7 @@ public class UserDao {
 
 	public UserEntity validateUser(Long userId) {
 		return userRepository.findById(userId)
-				.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
 	}
     public String generateSecureToken() {
@@ -223,8 +220,7 @@ public class UserDao {
 
     public UserResponseBean updateUserStatus(Long userId, UserStatusEnum statusReq) {
         log.info("Updating status for user with ID: {}", userId);
-        UserEntity userEntity = userRepository.findById(userId)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+        UserEntity userEntity=validateUser(userId);
         userEntity.setStatus(statusReq.getValue());
         userEntity = userRepository.save(userEntity);
         log.info("User status updated to {} for user ID: {}", statusReq, userId);