diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index d454524ee4a..f0e8a69813f 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -196,33 +196,34 @@
 		return
 	if(opened)
 		if(istype(W, cutting_tool))
-			if(istype(cutting_tool, /obj/item/weapon/weldingtool))
+			if(istype(W, /obj/item/weapon/weldingtool))
 				var/obj/item/weapon/weldingtool/WT = W
 				if(!WT.remove_fuel(0, user))
 					return
 				user << "<span class='notice'>You begin cutting \the [src] apart...</span>"
 				playsound(loc, cutting_sound, 40, 1)
-				if(do_after(user, 40/W.toolspeed, 1, target = src))
+				if(do_after(user, 40/WT.toolspeed, 1, target = src))
 					if(!opened || !WT.isOn())
 						return
 					playsound(loc, cutting_sound, 50, 1)
-					new material_drop(loc)
 					visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
 									"<span class='notice'>You cut \the [src] apart with \the [WT].</span>",
 									"<span class='italics'>You hear welding.</span>")
+					var/turf/T = get_turf(src)
+					new material_drop(T)
 					qdel(src)
 		else if(user.drop_item())
 			W.Move(loc)
 	else
 		if(istype(W, /obj/item/stack/packageWrap))
 			return
-		if(istype(W, /obj/item/weapon/weldingtool) && can_weld_shut)
+		else if(istype(W, /obj/item/weapon/weldingtool) && can_weld_shut)
 			var/obj/item/weapon/weldingtool/WT = W
 			if(!WT.remove_fuel(0, user))
 				return
 			user << "<span class='notice'>You begin [welded ? "unwelding":"welding"] \the [src]...</span>"
 			playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
-			if(do_after(user, 40, 1, target = src))
+			if(do_after(user, 40/WT.toolspeed, 1, target = src))
 				if(opened || !WT.isOn())
 					return
 				playsound(loc, 'sound/items/welder.ogg', 50, 1)