diff --git a/src/runtime2/component/component_pdl.rs b/src/runtime2/component/component_pdl.rs
index 0e9bf987c38a1fcbc10e80cba1f1aff0b5f5df3d..49558c30e73d6fb90b48875c9f3bf0f8fa248450 100644
--- a/src/runtime2/component/component_pdl.rs
+++ b/src/runtime2/component/component_pdl.rs
@@ -318,6 +318,8 @@ impl Component for CompPDL {
 
                 let port_id = port_id_from_eval(port_id);
                 let port_handle = comp_ctx.get_port_handle(port_id);
+                comp_ctx.get_port_mut(port_handle).last_instruction = PortInstruction::SourceLocation(expr_id);
+
                 let port_index = comp_ctx.get_port_index(port_handle);
                 if let Some(message) = &self.inbox_main[port_index] {
                     // Check if we can actually receive the message
@@ -578,7 +580,7 @@ impl CompPDL {
             }
         };
 
-        self.handle_component_error(sched_Ctx, error);
+        self.handle_component_error(sched_ctx, error);
     }
 
     fn handle_component_error(&mut self, sched_ctx: &SchedulerCtx, error: CompError) {