diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 87d964ada1..440c371884 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -63,6 +63,8 @@
 				src.MouseDrop_T(W:affecting, user)	//act like they were dragged onto the closet
 			else
 				user << "<span class='notice'>The locker is too small to stuff [W] into!</span>"
+		if(isrobot(user))
+			return
 		user.drop_item()
 		if(W)
 			W.loc = src.loc
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 719647ebab..72430976b8 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -78,6 +78,8 @@ Note: Must be placed within 3 tiles of the R&D Console
 		user << "\red The protolathe is busy right now."
 		return
 	if (istype(O, /obj/item) && !loaded_item)
+		if(isrobot(user)) //Don't put your module items in there!
+			return
 		if(!O.origin_tech)
 			user << "\red This doesn't seem to have a tech origin!"
 			return