From 9c709d29fd4e37aeb41a9959889347e8d579273b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 25 Sep 2020 12:27:45 +0100
Subject: util.error: Minor tweaks to error creation code to prepare for future
 changes

---
 util/error.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/error.lua b/util/error.lua
index ade1bb3b..4079a876 100644
--- a/util/error.lua
+++ b/util/error.lua
@@ -42,16 +42,19 @@ local function new(e, context, registry, source)
 		context.traceback = debug.traceback("error stack", 2);
 	end
 
-	return setmetatable({
+	local error_instance = setmetatable({
 		instance_id = id.short();
+
 		type = template.type or "cancel";
 		condition = template.condition or "undefined-condition";
 		text = template.text;
 		code = template.code;
 
-		context = context or template.context or { _error_id = e };
+		context = context;
 		source = source;
 	}, error_mt);
+
+	return error_instance;
 end
 
 local function init(source, registry)
-- 
cgit v1.2.3