Merge branch 'son/matches' into son/merge_back

1 files changed, 4 insertions, 1 deletions

diff --git a/compiler/InterpreterStatements.ml b/compiler/InterpreterStatements.ml
index 66b8492a..30b7b333 100644
--- a/compiler/InterpreterStatements.ml
+++ b/compiler/InterpreterStatements.ml
@@ -1125,7 +1125,10 @@ and eval_switch (config : config) (switch : switch) : st_cm_fun =
               let dv = Option.get adt.variant_id in
               (* Find the branch, evaluate and continue *)
               match List.find_opt (fun (svl, _) -> List.mem dv svl) stgts with
-              | None -> eval_statement config otherwise cf ctx
+              | None -> (
+                  match otherwise with
+                  | None -> raise (Failure "No otherwise branch")
+                  | Some otherwise -> eval_statement config otherwise cf ctx)
               | Some (_, tgt) -> eval_statement config tgt cf ctx)
           | VSymbolic sv ->
               (* Expand the symbolic value - may lead to branching *)