diff --git a/src/Controller/OgRepository/Webhook/ResponseController.php b/src/Controller/OgRepository/Webhook/ResponseController.php
index eff9404..83a9aac 100644
--- a/src/Controller/OgRepository/Webhook/ResponseController.php
+++ b/src/Controller/OgRepository/Webhook/ResponseController.php
@@ -86,12 +86,12 @@ class ResponseController extends AbstractOgRepositoryController
     {
         $trace = $this->entityManager->getRepository(Trace::class)->findOneBy(['jobId' => $data['job_id']]);
         $imageUuid = $trace->getInput()['imageUuid'];
+
         $imageImageRepositoryUuid = $trace->getInput()['imageImageRepositoryUuid'];
         $repositoryUuid = $trace->getInput()['repositoryUuid'];
 
         $image = $this->entityManager->getRepository(Image::class)->findOneBy(['uuid' => $imageUuid]);
         $repository = $this->entityManager->getRepository(ImageRepository::class)->findOneBy(['uuid' => $repositoryUuid]);
-        $imageImageRepository = $this->entityManager->getRepository(ImageImageRepository::class)->findOneBy(['uuid' => $imageImageRepositoryUuid]);
 
         if ($data['success'] !== true) {
             $this->updateTraceStatus($trace, TraceStatus::FAILED, 'Action failed');
@@ -108,9 +108,14 @@ class ResponseController extends AbstractOgRepositoryController
             return;
         }
 
-        if ($imageImageRepository) {
-            $this->updateTraceStatus($trace, TraceStatus::FAILED, 'Image repository not found');
-            $imageImageRepository->setStatus(ImageStatus::SUCCESS);
+        if (isset($trace->getInput()['imageImageRepositoryUuid'])) {
+            $imageImageRepositoryUuid = $trace->getInput()['imageImageRepositoryUuid'];
+            $imageImageRepository = $this->entityManager->getRepository(ImageImageRepository::class)->findOneBy(['uuid' => $imageImageRepositoryUuid]);
+
+            if ($imageImageRepository) {
+                $this->updateTraceStatus($trace, TraceStatus::FAILED, 'Image repository not found');
+                $imageImageRepository->setStatus(ImageStatus::SUCCESS);
+            }
         }
 
         $this->logger->info("Image $actionType successful", ['image' => $image->getName()]);