diff --git a/code/modules/unit_tests/closets.dm b/code/modules/unit_tests/closets.dm
index b7f0d5e94c4..8145e2a0a9b 100644
--- a/code/modules/unit_tests/closets.dm
+++ b/code/modules/unit_tests/closets.dm
@@ -9,10 +9,11 @@
 
 	for(var/closet_type in all_closets)
 		var/obj/structure/closet/closet = allocate(closet_type)
+		if(istype(closet_type, /obj/structure/closet/emcloset) && QDELETED(closet)) // this is here because the emcloset subtype has a chance of returning a qdel hint on initialize
+			continue
 
 		// Copy is necessary otherwise closet.contents - immediate_contents returns an empty list
 		var/list/immediate_contents = closet.contents.Copy()
-
 		closet.PopulateContents()
 		var/contents_len = length(closet.contents)