diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index 1f9f572ce42..176a9c29f92 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -56,9 +56,12 @@
 	if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up.
 		if(I.loc.atom_storage) //in a container.
 			I.loc.atom_storage.remove_single(user, I, src)
-		if(!user.dropItemToGround(I))
+		if(!user.is_holding(I) || HAS_TRAIT(I, TRAIT_NODROP))
 			return
 
+	if(QDELETED(I))
+		return
+
 	user.visible_message(span_notice("[user] puts [I] into [src]."), span_notice("You put [I] inside [src]."),\
 	span_hear("You hear a rustle as someone puts something into a plastic bag."))