diff --git a/src/protocol/eval/executor.rs b/src/protocol/eval/executor.rs
index fe43edfd8207faf5e777a0eb40d607093c617812..feab9c135698e49f53dba5985a928d1644f48478 100644
--- a/src/protocol/eval/executor.rs
+++ b/src/protocol/eval/executor.rs
@@ -896,12 +896,12 @@ impl Prompt {
                 Ok(EvalContinuation::Stepping)
             },
             Statement::Break(stmt) => {
-                cur_frame.position = stmt.target.unwrap().upcast();
+                cur_frame.position = stmt.target.upcast();
 
                 Ok(EvalContinuation::Stepping)
             },
             Statement::Continue(stmt) => {
-                cur_frame.position = stmt.target.unwrap().upcast();
+                cur_frame.position = stmt.target.upcast();
 
                 Ok(EvalContinuation::Stepping)
             },
@@ -992,7 +992,7 @@ impl Prompt {
                 return Ok(EvalContinuation::Stepping);
             },
             Statement::Goto(stmt) => {
-                cur_frame.position = stmt.target.unwrap().upcast();
+                cur_frame.position = stmt.target.upcast();
 
                 Ok(EvalContinuation::Stepping)
             },