diff --git a/src/Operand/PlatformFunction/Executor/IdentityExecutor.php b/src/Operand/PlatformFunction/Executor/IdentityExecutor.php
index 75186894..98cdcf88 100644
--- a/src/Operand/PlatformFunction/Executor/IdentityExecutor.php
+++ b/src/Operand/PlatformFunction/Executor/IdentityExecutor.php
@@ -19,7 +19,7 @@
 final class IdentityExecutor
 {
     /**
-     * @throw OperandNotExecuteException
+     * @throws OperandNotExecuteException
      */
     public function __invoke(): void
     {
diff --git a/src/Operand/PlatformFunction/Executor/PlatformFunctionExecutorRegistry.php b/src/Operand/PlatformFunction/Executor/PlatformFunctionExecutorRegistry.php
index 0073660e..02c2ca5e 100644
--- a/src/Operand/PlatformFunction/Executor/PlatformFunctionExecutorRegistry.php
+++ b/src/Operand/PlatformFunction/Executor/PlatformFunctionExecutorRegistry.php
@@ -39,7 +39,7 @@ public function __construct(array $executors)
      * @param string $functionName
      * @param mixed  ...$arguments
      *
-     * @throw PlatformFunctionExecutorException
+     * @throws PlatformFunctionExecutorException
      *
      * @return mixed
      */
@@ -70,7 +70,7 @@ public function has(string $functionName): bool
      * @param string   $functionName
      * @param callable $executor
      *
-     * @throw PlatformFunctionExecutorException
+     * @throws PlatformFunctionExecutorException
      */
     public function register(string $functionName, callable $executor): void
     {
@@ -89,7 +89,7 @@ public function register(string $functionName, callable $executor): void
      * @param string   $functionName
      * @param callable $executor
      *
-     * @throw PlatformFunctionExecutorException
+     * @throws PlatformFunctionExecutorException
      */
     public function override(string $functionName, callable $executor): void
     {
diff --git a/src/Repository/EntitySpecificationRepositoryInterface.php b/src/Repository/EntitySpecificationRepositoryInterface.php
index a4fb38f5..a80e75e3 100644
--- a/src/Repository/EntitySpecificationRepositoryInterface.php
+++ b/src/Repository/EntitySpecificationRepositoryInterface.php
@@ -17,6 +17,8 @@
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
+use Happyr\DoctrineSpecification\Exception\NonUniqueResultException;
+use Happyr\DoctrineSpecification\Exception\NoResultException;
 use Happyr\DoctrineSpecification\Filter\Filter;
 use Happyr\DoctrineSpecification\Query\QueryModifier;
 use Happyr\DoctrineSpecification\Result\ResultModifier;
@@ -42,8 +44,8 @@ public function match($specification, ?ResultModifier $modifier = null);
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NonUniqueResultException If more than one result is found
+     * @throws NoResultException        If no results found
      *
      * @return mixed
      */
@@ -55,7 +57,7 @@ public function matchSingleResult($specification, ?ResultModifier $modifier = nu
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
+     * @throws NonUniqueResultException If more than one result is found
      *
      * @return mixed|null
      */
@@ -67,8 +69,8 @@ public function matchOneOrNullResult($specification, ?ResultModifier $modifier =
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NonUniqueResultException If more than one result is found
+     * @throws NoResultException        If no results found
      *
      * @return mixed
      */
@@ -80,8 +82,7 @@ public function matchSingleScalarResult($specification, ?ResultModifier $modifie
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NoResultException If no results found
      *
      * @return mixed
      */
diff --git a/src/Repository/EntitySpecificationRepositoryTrait.php b/src/Repository/EntitySpecificationRepositoryTrait.php
index 3f7d15b6..1e1c8dad 100644
--- a/src/Repository/EntitySpecificationRepositoryTrait.php
+++ b/src/Repository/EntitySpecificationRepositoryTrait.php
@@ -56,8 +56,8 @@ public function match($specification, ?ResultModifier $modifier = null)
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NonUniqueResultException If more than one result is found
+     * @throws NoResultException        If no results found
      *
      * @return mixed
      */
@@ -80,7 +80,7 @@ public function matchSingleResult($specification, ?ResultModifier $modifier = nu
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
+     * @throws NonUniqueResultException If more than one result is found
      *
      * @return mixed|null
      */
@@ -99,8 +99,8 @@ public function matchOneOrNullResult($specification, ?ResultModifier $modifier =
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NonUniqueResultException If more than one result is found
+     * @throws NoResultException        If no results found
      *
      * @return mixed
      */
@@ -112,6 +112,8 @@ public function matchSingleScalarResult($specification, ?ResultModifier $modifie
             return $query->getSingleScalarResult();
         } catch (DoctrineNonUniqueResultException $e) {
             throw new NonUniqueResultException($e->getMessage(), $e->getCode(), $e);
+        } catch (DoctrineNoResultException $e) {
+            throw new NoResultException($e->getMessage(), $e->getCode(), $e);
         }
     }
 
@@ -121,8 +123,7 @@ public function matchSingleScalarResult($specification, ?ResultModifier $modifie
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throws NoResultException If no results found
      *
      * @return mixed
      */
@@ -130,7 +131,11 @@ public function matchScalarResult($specification, ?ResultModifier $modifier = nu
     {
         $query = $this->getQuery($specification, $modifier);
 
-        return $query->getScalarResult();
+        try {
+            return $query->getScalarResult();
+        } catch (DoctrineNoResultException $e) {
+            throw new NoResultException($e->getMessage(), $e->getCode(), $e);
+        }
     }
 
     /**