diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverControllerItTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverControllerItTest.java
index f33a58d02f6eabcb214b9d72dcb7ef6f53bf67e7..13814dafebd455689e3caa59be35518bb2b68a8a 100644
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverControllerItTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverControllerItTest.java
@@ -23,7 +23,6 @@ class DriverControllerItTest {
 
   @Test
   public void testSave() {
-    // Create a new instance of MyEntity
     Driver driver = Driver.builder()
         .name("name")
         .surname("surname")
@@ -31,7 +30,7 @@ class DriverControllerItTest {
         .characteristics(Map.of()).build();
 
     Driver savedDriver = driverRepository.save(driver);
-    
+
     Assertions.assertEquals(savedDriver, driver);
     Assertions.assertEquals(entityManager.find(Driver.class, 1L).getId(), 1);
   }
diff --git a/race/src/main/java/cz/muni/pa165/race/App.java b/race/src/main/java/cz/muni/pa165/race/App.java
index 41c699e46c0c584de74d8a71ed81118337cc987d..172899c5771f8e094eeb302d6d95f80b0fe27573 100644
--- a/race/src/main/java/cz/muni/pa165/race/App.java
+++ b/race/src/main/java/cz/muni/pa165/race/App.java
@@ -20,7 +20,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableJpaRepositories(basePackages = "cz.muni.pa165.race.data.repository")
 @EnableTransactionManagement
-@EntityScan(basePackageClasses = {Race.class, Season.class, Car.class, Driver.class, CarComponent.class})
+@EntityScan(basePackageClasses = {Race.class, Season.class, Car.class, Driver.class,
+    CarComponent.class})
 @Import({RestExceptionHandler.class, ClientConfig.class})
 public class App {
 
diff --git a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
index 1845ece478fe09afb4025858c2217de5d208f38b..7da921067a2552e039ce9fe188e3418c82b44f17 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
@@ -62,15 +62,15 @@ public class RaceService {
    * Assigns driver one.
    */
   public RaceDto assignDriverOne(Long driverId, Long raceId, Long carId) {
-    var driver = getDriver(driverId);
-    var car = getCar(carId);
     var race = raceRepository.findById(raceId)
         .orElseThrow(() -> new DatabaseException("Race not found"));
 
+    var driver = getDriver(driverId);
     if (race.getDriver2() != null && Objects.equals(race.getDriver2().getDriverId(), driverId)) {
       throw new BadRequestException("Driver already assigned to the race as driver two");
     }
 
+    var car = getCar(carId);
     if (race.getDriver2() != null && Objects.equals(race.getDriver2().getCarId(), carId)) {
       throw new BadRequestException("Car is already assigned to the race for driver two");
     }
@@ -83,14 +83,14 @@ public class RaceService {
    * Assigns driver two.
    */
   public RaceDto assignDriverTwo(Long driverId, Long raceId, Long carId) {
-    var driver = getDriver(driverId);
-    var car = getCar(carId);
     var race = raceRepository.findById(raceId)
         .orElseThrow(() -> new DatabaseException("Race not found"));
 
+    var driver = getDriver(driverId);
     if (race.getDriver1() != null && Objects.equals(race.getDriver1().getDriverId(), driverId)) {
       throw new BadRequestException("Driver already assigned to the race as driver one");
     }
+    var car = getCar(carId);
     if (race.getDriver1() != null && Objects.equals(race.getDriver1().getCarId(), carId)) {
       throw new BadRequestException("Car is already assigned to the race for driver two");
     }