diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index a596db41b82..8a963b6600d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -208,6 +208,10 @@
 						E.teleporting = 0
 						return
 					E.teleporting = 0
+					if(user in contents)
+						user << "<span class='warning'>Error: User located in container--aborting for safety.</span>"
+						playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
+						return
 					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
@@ -226,6 +230,10 @@
 					E.teleporting = 0
 					return
 				E.teleporting = 0
+				if(user in contents)
+					user << "<span class='warning'>Error: User located in container--aborting for safety.</span>"
+					playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
+					return
 				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 				s.set_up(5, 1, src)
 				s.start()