From b622ea4fd2254ecf0a982937ee2ac120533a939a Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Fri, 27 Sep 2019 13:49:25 +0100
Subject: [PATCH] Fixes

---
 code/modules/mob/living/carbon/life.dm | 6 ++++--
 code/modules/surgery/organs/eyes.dm    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 5c94448055..cdcfeedc80 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -386,11 +386,13 @@
 	if(stat != DEAD)
 		for(var/V in internal_organs)
 			var/obj/item/organ/O = V
-			O.on_life()
+			if(O)
+				O.on_life()
 	else
 		for(var/V in internal_organs)
 			var/obj/item/organ/O = V
-			O.on_death() //Needed so organs decay while inside the body.
+			if(O)
+				O.on_death() //Needed so organs decay while inside the body.
 
 /mob/living/carbon/handle_diseases()
 	for(var/thing in diseases)
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 3b5e4cfe82..cb890082cd 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -185,7 +185,7 @@
 	M.become_blind("flashlight_eyes")
 
 
-/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, special = FALSE)
 	eye.on = FALSE
 	eye.update_brightness(M)
 	eye.forceMove(src)