diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index 43fd613d1c2e2e3054354427aca69d004114f5c7..cc500b933b13597f00acacc76e3aa51d0c790b0f 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -4020,7 +4020,8 @@ struct
     Pretty_utils.ksfprintf (fun e -> raise (LogicTypeError (loc,e))) msg
 
   let on_error f rollback x =
-    try f x with LogicTypeError _ as exn -> rollback(); raise exn
+    try f x with
+    | LogicTypeError (loc,e) as exn -> rollback (loc,e); raise exn
 
 end
 
diff --git a/src/kernel_services/analysis/logic_interp.ml b/src/kernel_services/analysis/logic_interp.ml
index d5811d7526f997ac28515309340640eeca135cc2..8bc42ae19f772560872dc9f1b2e963c8ba1c8ecd 100644
--- a/src/kernel_services/analysis/logic_interp.ml
+++ b/src/kernel_services/analysis/logic_interp.ml
@@ -130,7 +130,7 @@ module DefaultLT (X:
         Pretty_utils.ksfprintf (fun e -> raise (Error (loc, e))) msg
 
       let on_error f rollback x =
-        try f x with Error _ as exn -> rollback (); raise exn
+        try f x with Error (loc,msg) as exn -> rollback (loc,msg); raise exn
 
     end)
 
diff --git a/src/kernel_services/ast_queries/acsl_extension.ml b/src/kernel_services/ast_queries/acsl_extension.ml
index 7445dddc90a485832dd140ab261abfcbebba5f02..a567ed8ccca770cba8ff20fcccde8d48e0237e87 100644
--- a/src/kernel_services/ast_queries/acsl_extension.ml
+++ b/src/kernel_services/ast_queries/acsl_extension.ml
@@ -152,7 +152,7 @@ module Extensions = struct
     let status = ext_info.status in
     let typer =  ext_info.typer in
     let normal_error = ref false in
-    let has_error () = normal_error := true in
+    let has_error _ = normal_error := true in
     let wrapper =
       typing_context.on_error (typer typing_context loc) has_error
     in
@@ -168,7 +168,7 @@ module Extensions = struct
     let status = ext_info.status in
     let typer =  ext_info.typer in
     let normal_error = ref false in
-    let has_error () = normal_error := true in
+    let has_error _ = normal_error := true in
     let wrapper =
       typing_context.on_error (typer typing_context loc) has_error
     in
diff --git a/src/kernel_services/ast_queries/logic_typing.ml b/src/kernel_services/ast_queries/logic_typing.ml
index b8c0cc94f21d40b61fbda1551f41c15d66d7b4cb..69a4d9e33cb484fd8af1aacf3e1e9faebcf46fba 100644
--- a/src/kernel_services/ast_queries/logic_typing.ml
+++ b/src/kernel_services/ast_queries/logic_typing.ml
@@ -482,7 +482,6 @@ module Type_namespace =
     let hash : t -> int = Hashtbl.hash
   end)
 
-
 type typing_context = {
   is_loop: unit -> bool;
   anonCompFieldName : string;
@@ -520,7 +519,7 @@ type typing_context = {
     Lenv.t ->
     Logic_ptree.assigns -> Cil_types.assigns;
   error: 'a 'b. location -> ('a,formatter,unit,'b) format4 -> 'a;
-  on_error: 'a 'b. ('a -> 'b) -> (unit -> unit) -> 'a -> 'b
+  on_error: 'a 'b. ('a -> 'b) -> ((location * string) -> unit) -> 'a -> 'b
 }
 
 module Extensions = struct
@@ -656,7 +655,7 @@ module Make
        val find_logic_ctor: string -> logic_ctor_info
        val integral_cast: Cil_types.typ -> Cil_types.term -> Cil_types.term
        val error: location -> ('a,formatter,unit, 'b) format4 -> 'a
-       val on_error: ('a -> 'b) -> (unit -> unit) -> 'a -> 'b
+       val on_error: ('a -> 'b) -> ((location * string) -> unit) -> 'a -> 'b
      end) =
 struct
 
@@ -4305,7 +4304,7 @@ struct
     let res = annot false a in
     finish_transaction (); res
 
-  let annot = C.on_error annot rollback_transaction
+  let annot = C.on_error annot (fun _ -> rollback_transaction ())
 
 end
 
diff --git a/src/kernel_services/ast_queries/logic_typing.mli b/src/kernel_services/ast_queries/logic_typing.mli
index 838eede9a178bc670da52354425b8a4571119714..cde1a1284e89f4645fb5e8d221490ca2dea6562b 100644
--- a/src/kernel_services/ast_queries/logic_typing.mli
+++ b/src/kernel_services/ast_queries/logic_typing.mli
@@ -143,12 +143,14 @@ type typing_context = {
   error: 'a 'b. location -> ('a,Format.formatter,unit,'b) format4 -> 'a;
 
   (** [on_error f rollback x] will attempt to evaluate [f x]. If this triggers
-      an error while in [-continue-annot-error] mode, [rollback ()] will be
-      executed and the exception re-raised.
+      an error while in [-continue-annot-error] mode, [rollback (loc,cause)]
+      will be executed (where [loc] is the location of the error and [cause]
+      a text message indicating the issue) and the exception will be re-raised.
 
       @since Chlorine-20180501
+      @modify Frama-C+dev rollback takes as argument the error
   *)
-  on_error: 'a 'b. ('a -> 'b) -> (unit -> unit) -> 'a -> 'b
+  on_error: 'a 'b. ('a -> 'b) -> ((location * string) -> unit) -> 'a -> 'b
 }
 
 module Make
@@ -192,7 +194,7 @@ module Make
        val error: location -> ('a,Format.formatter,unit, 'b) format4 -> 'a
 
        (** see {!Logic_typing.typing_context}. *)
-       val on_error: ('a -> 'b) -> (unit -> unit) -> 'a -> 'b
+       val on_error: ('a -> 'b) -> ((location * string) -> unit) -> 'a -> 'b
 
      end) :
 sig