diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 5600fc16f3..a475bb7069 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -274,16 +274,16 @@
 				ismist = 0
 
 
-/obj/machinery/shower/Crossed(atom/movable/O)
+/obj/machinery/shower/Crossed(atom/movable/AM)
 	..()
 	if(on)
-		if(isliving(O))
-			var/mob/living/L = O
+		if(isliving(AM))
+			var/mob/living/L = AM
 			if(wash_mob(L)) //it's a carbon mob.
 				var/mob/living/carbon/C = L
 				C.slip(80,null,NO_SLIP_WHEN_WALKING)
-		else
-			wash_obj(O)
+		else if(isobj(AM))
+			wash_obj(AM)
 
 
 /obj/machinery/shower/proc/wash_obj(obj/O)
@@ -374,12 +374,11 @@
 /obj/machinery/shower/process()
 	if(on)
 		wash_turf()
-		for(var/atom/movable/G in loc)
-			if(isliving(G))
-				var/mob/living/L = G
-				wash_mob(L)
-			else
-				wash_obj(G)
+		for(var/atom/movable/AM in loc)
+			if(isliving(AM))
+				wash_mob(AM)
+			else if(isobj(AM))
+				wash_obj(AM)
 
 /obj/machinery/shower/deconstruct(disassembled = TRUE)
 	new /obj/item/stack/sheet/metal (loc, 3)