diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm
index f327fc7b11..d7f00c463b 100644
--- a/code/WorkInProgress/recycling/disposal.dm
+++ b/code/WorkInProgress/recycling/disposal.dm
@@ -88,15 +88,15 @@
 
 		var/msg
 		for (var/mob/V in viewers(usr))
-			if(target == user && !user.stat)
+			if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 				V.show_message("[usr] starts climbing into the disposal.", 3)
 			if(target != user && !user.restrained())
 				if(target.anchored) return
 				V.show_message("[usr] starts stuffing [target.name] into the disposal.", 3)
 		if(!do_after(usr, 20))
 			return
-		if(target == user && !user.stat)	// if drop self, then climbed in
-												// must be awake
+		if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)	// if drop self, then climbed in
+												// must be awake, not stunned or whatever
 			msg = "[user.name] climbs into the [src]."
 			user << "You climb into the [src]."
 		else if(target != user && !user.restrained())
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 0d1bc4842c..2ccb815036 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -344,7 +344,8 @@
 	src.visible_message("\red <B>[src] blows apart!</B>", 1)
 	var/turf/Tsec = get_turf(src)
 
-	new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
+	var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
+	N.contents = list()
 
 	new /obj/item/device/prox_sensor(Tsec)