diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 1e804bbb26..0ec3f40036 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -33,6 +33,9 @@ would spawn and follow the beaker, even if it is carried or thrown.
 
 	proc/start()
 
+	Destroy()
+		holder = null
+		return ..()
 
 /////////////////////////////////////////////
 // GENERIC STEAM SPREAD SYSTEM
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
index d29981726d..d5ba330c0d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm
@@ -57,7 +57,7 @@
 	return ..()
 
 /mob/living/simple_mob/mechanical/mecha/Destroy()
-	qdel(sparks)
+	qdel_null(sparks)
 	return ..()
 
 /mob/living/simple_mob/mechanical/mecha/death()