diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 6dacdd33cfd..8d2eeb4e4ec 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -21,6 +21,8 @@
 
 // creates the random item
 /obj/random/proc/spawn_item()
+
+
 	var/build_path = item_to_spawn()
 	new build_path(loc)
 
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index bc4e9d5f889..077ba16c813 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -27,8 +27,9 @@
 /obj/structure/closet/initialize()
 	..()
 	if(!opened)		// if closed, any item at the crate's loc is put in the contents
-		var/obj/item/I
+		var/obj/I
 		for(I in src.loc)
+			if (!istype(I, /obj/item) && !istype(I, /obj/random))continue
 			if(I.density || I.anchored || I == src) continue
 			I.forceMove(src)
 		// adjust locker size to hold all items with 5 units of free store room
diff --git a/code/modules/projectiles/guns/energy/lawgiver.dm b/code/modules/projectiles/guns/energy/lawgiver.dm
index 4075cda9c42..d8d3d91e797 100644
--- a/code/modules/projectiles/guns/energy/lawgiver.dm
+++ b/code/modules/projectiles/guns/energy/lawgiver.dm
@@ -118,9 +118,9 @@
 
 /obj/item/weapon/gun/energy/lawgiver/hear_talk(mob/living/M in range(0,src), msg)
 	var/mob/living/carbon/human/H = M
-	if (!H)
+	if (!H || !istype(H))
 		return
-	if( (src.dna==usr.dna.unique_enzymes || emagged) && (src in usr.contents))
+	if( (src.dna==H.dna.unique_enzymes || emagged) && (src in H.contents))
 		hear(msg)
 	return