diff --git a/core/src/main/java/cz/muni/fi/pa165/core/facade/country/CountryFacadeImpl.java b/core/src/main/java/cz/muni/fi/pa165/core/facade/country/CountryFacadeImpl.java
index 6f2b634bf49019a965ac48a29f8031ebc0aa9277..b5b957635b149e39537a0b042c69711105744c0e 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/facade/country/CountryFacadeImpl.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/facade/country/CountryFacadeImpl.java
@@ -34,7 +34,7 @@ public class CountryFacadeImpl implements CountryFacade<Long> {
     @Override
     public Optional<CountryDto> findById(Long id) {
         Country foundEntity = countryService.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException("Country with id " + id + " not found."));
+                .orElseThrow(ResourceNotFoundException::new);
         return Optional.of(countryMapper.toDto(foundEntity));
     }
 
@@ -48,6 +48,9 @@ public class CountryFacadeImpl implements CountryFacade<Long> {
 
     @Override
     public void deleteById(Long id) {
+        if (!countryService.existsById(id)) {
+            throw new ResourceNotFoundException();
+        }
         countryService.deleteById(id);
     }
 
@@ -58,10 +61,12 @@ public class CountryFacadeImpl implements CountryFacade<Long> {
 
     @Override
     public CountryDto update(Long id, NewCountryDtoRequest newCountryDtoRequest) {
-        Country updatedEntity = countryService.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException("Country with id " + id + " not found."));
-        updatedEntity.setName(newCountryDtoRequest.getName());
-        countryService.save(updatedEntity);
+        if (!countryService.existsById(id)) {
+            throw new ResourceNotFoundException();
+        }
+
+        Country newEntity = countryMapper.toEntityFromNewRequest(newCountryDtoRequest);
+        Country updatedEntity = countryService.update(id, newEntity);
         return countryMapper.toDto(updatedEntity);
     }