diff --git a/crates/uplc/src/machine.rs b/crates/uplc/src/machine.rs
index 58ab45af..81cd44ae 100644
--- a/crates/uplc/src/machine.rs
+++ b/crates/uplc/src/machine.rs
@@ -242,7 +242,7 @@ impl Machine {
                     )),
                     None => todo!(),
                 },
-                _ => todo!(),
+                _ => todo!("return a proper evaluation error"),
             },
         }
     }
diff --git a/crates/uplc/tests/conformance.rs b/crates/uplc/tests/conformance.rs
index a343a1ed..8107a82e 100644
--- a/crates/uplc/tests/conformance.rs
+++ b/crates/uplc/tests/conformance.rs
@@ -28,7 +28,9 @@ fn actual_evaluation_result(file: &Path) -> Result<Program<Name>, String> {
 
     let program = parser::program(&code).map_err(|_| PARSE_ERROR.to_string())?;
 
-    let program: Program<NamedDeBruijn> = program.try_into().unwrap();
+    let program: Program<NamedDeBruijn> = program
+        .try_into()
+        .map_err(|_| EVALUATION_FAILURE.to_string())?;
 
     let version = program.version;