diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index ddb5d7ec5d..892867c316 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -234,6 +234,8 @@
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
+	if(!chassis)
+		return
 	moveto = moveto || get_turf(chassis)
 	forceMove(moveto)
 	chassis.equipment -= src
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 2ea550d66d..ff9a68fd34 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -38,7 +38,7 @@
 	for(var/d in cardinal)
 		var/turf/simulated/target = get_step(src,d)
 		var/turf/simulated/origin = get_turf(src)
-		if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
+		if(origin.CanPass(src, target, 0, 0) && target.CanPass(src, origin, 0, 0))
 			var/obj/effect/decal/cleanable/liquid_fuel/other_fuel = locate() in target
 			if(other_fuel)
 				other_fuel.amount += amount*0.25
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 825459b8f4..760c111466 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -1,4 +1,5 @@
 /obj/structure/girder
+	name = "girder"
 	icon_state = "girder"
 	anchored = TRUE
 	density = TRUE
@@ -418,4 +419,3 @@
 
 /obj/structure/girder/eris
 	wall_type = /turf/simulated/wall/eris
-	
\ No newline at end of file