diff --git a/src/main/java/de/pnreichmuth/timekeep_backend/services/RacerService.java b/src/main/java/de/pnreichmuth/timekeep_backend/services/RacerService.java
index 83dc110..a864b62 100644
--- a/src/main/java/de/pnreichmuth/timekeep_backend/services/RacerService.java
+++ b/src/main/java/de/pnreichmuth/timekeep_backend/services/RacerService.java
@@ -3,6 +3,7 @@ package de.pnreichmuth.timekeep_backend.services;
 import de.pnreichmuth.timekeep_backend.entities.Racer;
 import de.pnreichmuth.timekeep_backend.exceptions.RacerExistsException;
 import de.pnreichmuth.timekeep_backend.exceptions.RacerNotFoundException;
+import de.pnreichmuth.timekeep_backend.exceptions.TeamNotFoundException;
 import de.pnreichmuth.timekeep_backend.repositories.RacerRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +58,10 @@ public class RacerService {
         if(racer.getRacerID() != null) dbRacer = racerRepository.getRacerByRacerID(racer.getRacerID()).orElse(null);
         else if(racer.getFirstName() != null && racer.getLastName() != null) dbRacer = racerRepository.getRacerByFirstNameAndLastName(racer.getFirstName(),racer.getLastName()).orElse(null);
         else throw new IllegalArgumentException("Must provide either Racer ID or full Racer name");
-        if(dbRacer == null) throw new RacerNotFoundException("Racer not found");
+        if (dbRacer == null){
+            if(racer.getRacerID() != null) throw new TeamNotFoundException("Racer with id "+racer.getRacerID()+" not found");
+            else throw new TeamNotFoundException("Racer with name "+racer.getFirstName()+" "+ racer.getLastName()+" not found");
+        }
         return dbRacer;
     }