diff --git a/code/__DEFINES/stack_trace.dm b/code/__DEFINES/stack_trace.dm
index 969eaecc7070..4911b4a0d571 100644
--- a/code/__DEFINES/stack_trace.dm
+++ b/code/__DEFINES/stack_trace.dm
@@ -1,2 +1,4 @@
 /// gives us the stack trace from CRASH() without ending the current proc.
 #define stack_trace(message) _stack_trace(message, __FILE__, __LINE__)
+
+#define WORKAROUND_IDENTIFIER "%//%"
diff --git a/code/__HELPERS/stack_trace.dm b/code/__HELPERS/stack_trace.dm
index 5c220d7a74a4..bb2d78de1108 100644
--- a/code/__HELPERS/stack_trace.dm
+++ b/code/__HELPERS/stack_trace.dm
@@ -1,4 +1,4 @@
 /// gives us the stack trace from CRASH() without ending the current proc.
 /// Do not call directly, use the [stack_trace] macro instead.
 /proc/_stack_trace(message, file, line)
-	CRASH("[message] ([file]:[line])")
+	CRASH("[message][WORKAROUND_IDENTIFIER][json_encode(list(file, line))][WORKAROUND_IDENTIFIER]")
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 1b3f6bca16d7..a6841d397544 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -26,6 +26,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 		Reboot(reason = 1)
 		return
 
+	var/static/regex/stack_workaround = regex("[WORKAROUND_IDENTIFIER](.+?)[WORKAROUND_IDENTIFIER]")
 	var/static/list/error_last_seen = list()
 	var/static/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
 												If negative, starts at -1, and goes down by 1 each time that error gets skipped*/
@@ -33,6 +34,12 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(!error_last_seen) // A runtime is occurring too early in start-up initialization
 		return ..()
 
+	if(stack_workaround.Find(E.name))
+		var/list/data = json_decode(stack_workaround.group[1])
+		E.file = data[1]
+		E.line = data[2]
+		E.name = stack_workaround.Replace(E.name, "")
+
 	var/erroruid = "[E.file][E.line]"
 	var/last_seen = error_last_seen[erroruid]
 	var/cooldown = error_cooldown[erroruid] || 0