diff --git a/modules/vm.cc b/modules/vm.cc index 600de4335..f9180b036 100644 --- a/modules/vm.cc +++ b/modules/vm.cc @@ -501,11 +501,12 @@ catch(const error &e) // VM FAULT CODE return handle_error ( *eval.opts, e.code, - "eval %s %s: %s %s", + "eval %s %s: %s %s :%s", json::get<"event_id"_>(event)?: json::string{""}, reflect(e.code), e.what(), - e.content + unquote(json::object(e.content).get("errcode")), + unquote(json::object(e.content).get("error")) ); } catch(const m::error &e) // GENERAL MATRIX ERROR @@ -513,10 +514,11 @@ catch(const m::error &e) // GENERAL MATRIX ERROR return handle_error ( *eval.opts, fault::GENERAL, - "eval %s #GP (General Protection): %s %s", + "eval %s #GP (General Protection): %s %s :%s", json::get<"event_id"_>(event)?: json::string{""}, e.what(), - e.content + unquote(json::object(e.content).get("errcode")), + unquote(json::object(e.content).get("error")) ); } catch(const ctx::interrupted &e) // INTERRUPTION