diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index 5650c3e0270..3b8f8530917 100644
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -106,12 +106,12 @@
 	src.throwing = 0
 	if (src.loc == user)
 		//canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
-		if(istype(src, /obj/item/clothing) && !src:canremove)
+		if(!src.canremove)
 			return
 		else
 			user.u_equip(src)
 	else
-		if(istype(src.loc, /mob/living))
+		if(isliving(src.loc))
 			return
 		src.pickup(user)
 		user.lastDblClick = world.time + 2
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index ed380ac8671..af2f39ba8ae 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -817,7 +817,7 @@ datum
 
 			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 				if(!..())	return
-				if(isrobot(M) || isAI(M)) return // Mutagen doesn't do anything to robutts!
+				if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
 				src = null
 				if((method==TOUCH && prob(33)) || method==INGEST)
 					randmuti(M)
@@ -829,7 +829,7 @@ datum
 					updateappearance(M,M.dna.uni_identity)
 				return
 			on_mob_life(var/mob/living/M as mob)
-				if(isrobot(M) || isAI(M)) return // Mutagen doesn't do anything to robutts!
+				if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
 				if(!M) M = holder.my_atom
 				M.apply_effect(10,IRRADIATE,0)
 				..()