SOC2 tracking: chore(engine): flatten nested if/else after error returns

Tracking issue for !1151 (merged) so the MR has an explicit close link for SOC2/change-management traceability.