diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php
index 434ffb6f3ae62d004ad8738cf3fc455361edc9de..a08217505178ce5640d6868f5dfd475db99f9b88 100644
--- a/Entity/Repository/UploadedFileRepository.php
+++ b/Entity/Repository/UploadedFileRepository.php
@@ -93,6 +93,12 @@ class UploadedFileRepository extends EntityRepository implements FileManagerInte
 
     public function get($id)
     {
+        if(!$id) {
+            return null;
+        }
+        if(!is_string($id) || !\Rhumsaa\Uuid\Uuid::isValid($id)) {
+            throw new \InvalidArgumentException(sprintf("Identifiant invalide: %s", (string)$id));
+        }
         return $this->findOneById($id);
     }