diff --git a/code/datums/components/medical/medicalAnalyzer.dm b/code/datums/components/medical/medicalAnalyzer.dm
index 02610a1e22b..7a8ef7fb81c 100644
--- a/code/datums/components/medical/medicalAnalyzer.dm
+++ b/code/datums/components/medical/medicalAnalyzer.dm
@@ -85,7 +85,7 @@
 			return TRUE
 
 /datum/component/health_analyzer/ui_status(mob/user, datum/ui_state/state)
-	var/obj/item/rig_module/containing_rig_module = owner.loc
+	var/obj/item/rig_module/containing_rig_module = owner?.loc
 	if(!containing_rig_module)
 		return ..()
 	else if(containing_rig_module)
diff --git a/html/changelogs/HealthCheckFix.yml b/html/changelogs/HealthCheckFix.yml
new file mode 100644
index 00000000000..be85c518ae3
--- /dev/null
+++ b/html/changelogs/HealthCheckFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps."