diff --git a/Directory.Build.props b/Directory.Build.props
index b99b6cd..23678db 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,7 +9,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>12</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/CrossValidation/ModelValidator.cs b/src/CrossValidation/ModelValidator.cs
index 58312a5..a215332 100644
--- a/src/CrossValidation/ModelValidator.cs
+++ b/src/CrossValidation/ModelValidator.cs
@@ -38,8 +38,6 @@ public IValidation<TField> Field<TField>(
         string? fieldDisplayName = null,
         [CallerArgumentExpression(nameof(field))] string fieldName = default!)
     {
-        // if ()
-        
         var fieldPath = fieldName.Contains('.')
             ? fieldName.Substring(fieldName.IndexOf('.') + 1)
             : fieldName;
diff --git a/src/CrossValidation/ValidationOperation.cs b/src/CrossValidation/ValidationOperation.cs
index cad1966..0a23106 100644
--- a/src/CrossValidation/ValidationOperation.cs
+++ b/src/CrossValidation/ValidationOperation.cs
@@ -218,19 +218,17 @@ public void HandleException(BusinessException exception, ValidationContext conte
         var exceptionToAdd = context.Exception ?? (Exception ?? exception);
         AddException(exceptionToAdd, context);
 
-        if (context is {ValidationMode: ValidationMode.StopOnFirstError})
+        if (context.ValidationMode is ValidationMode.StopOnFirstError
+            && context.ExceptionsCollected.Count == 1)
         {
-            if (context.ExceptionsCollected.Count == 1)
+            if (CustomExceptionToThrow is not null)
             {
-                if (CustomExceptionToThrow is not null)
-                {
-                    throw (Exception)Activator.CreateInstance(
-                        CustomExceptionToThrow,
-                        CreateParametrizedExceptionMessage(context.ExceptionsCollected[0]))!;
-                }
-                
-                throw context.ExceptionsCollected[0];
+                throw (Exception)Activator.CreateInstance(
+                    CustomExceptionToThrow,
+                    CreateParametrizedExceptionMessage(context.ExceptionsCollected[0]))!;
             }
+                
+            throw context.ExceptionsCollected[0];
         }
     }