diff --git a/crates/aiken-lang/src/parser/definition/validator.rs b/crates/aiken-lang/src/parser/definition/validator.rs
index ea7adf6e..cc54dbb4 100644
--- a/crates/aiken-lang/src/parser/definition/validator.rs
+++ b/crates/aiken-lang/src/parser/definition/validator.rs
@@ -42,12 +42,16 @@ pub fn parser() -> impl Parser<Token, ast::UntypedDefinition, Error = ParseError
                 },
             ));
 
+            let fun = functions
+                .next()
+                .expect("unwrapping safe because there's 'at_least(1)' function");
+
+            let other_fun = functions.next();
+
             ast::UntypedDefinition::Validator(ast::Validator {
                 doc: None,
-                fun: functions
-                    .next()
-                    .expect("unwrapping safe because there's 'at_least(1)' function"),
-                other_fun: functions.next(),
+                fun,
+                other_fun,
                 location: ast::Span {
                     start: span.start,
                     // capture the span from the optional params
diff --git a/crates/aiken-lang/src/tests/check.rs b/crates/aiken-lang/src/tests/check.rs
index b5265c1b..b51c2057 100644
--- a/crates/aiken-lang/src/tests/check.rs
+++ b/crates/aiken-lang/src/tests/check.rs
@@ -95,8 +95,6 @@ fn bls12_381_ml_result_in_data_type() {
 
     let res = check(parse(source_code));
 
-    dbg!(&res);
-
     assert!(matches!(res, Err((_, Error::IllegalTypeInData { .. }))))
 }
 
@@ -1912,7 +1910,7 @@ fn forbid_partial_down_casting() {
     "#;
 
     assert!(matches!(
-        dbg!(check(parse(source_code))),
+        check(parse(source_code)),
         Err((_, Error::CouldNotUnify { .. }))
     ))
 }
@@ -1931,7 +1929,7 @@ fn forbid_partial_up_casting() {
     "#;
 
     assert!(matches!(
-        dbg!(check(parse(source_code))),
+        check(parse(source_code)),
         Err((_, Error::CouldNotUnify { .. }))
     ))
 }
diff --git a/crates/aiken-lang/src/tipo/infer.rs b/crates/aiken-lang/src/tipo/infer.rs
index e9369acb..7b3e9b0c 100644
--- a/crates/aiken-lang/src/tipo/infer.rs
+++ b/crates/aiken-lang/src/tipo/infer.rs
@@ -318,13 +318,13 @@ fn infer_definition(
 
                         Ok(other_typed_fun)
                     })
-                    .transpose();
+                    .transpose()?;
 
                 Ok(Definition::Validator(Validator {
                     doc,
                     end_position,
                     fun: typed_fun,
-                    other_fun: typed_other_fun?,
+                    other_fun: typed_other_fun,
                     location,
                     params: typed_params,
                 }))