diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index bc6d8c0c11b..2d266b31936 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -28,7 +28,7 @@
 	density = 1
 	opacity = 1
 	anchored = 1
-	var/health = 170
+	var/health = 200
 	//var/mob/living/affecting = null
 
 	wall
@@ -41,7 +41,7 @@
 		desc = "Purple slime just thin enough to let light pass through."
 		icon_state = "resinmembrane"
 		opacity = 0
-		health = 20
+		health = 120
 
 /obj/effect/alien/resin/New()
 	..()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 69b06f35028..ced037e422c 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -96,7 +96,7 @@
 	if(src.machine)
 		unset_machine()
 	src.machine = O
-	if(O)
+	if(istype(O))
 		O.in_use = 1
 
 /obj/item/proc/updateSelfDialog()