diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 43f6b033d39..b935b68168b 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -6,6 +6,7 @@
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
 	wire_count = 12
+	window_x = 410
 	window_y = 570
 
 var/const/AIRLOCK_WIRE_IDSCAN = 1
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index bab046450a3..278b4513d2f 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -317,12 +317,16 @@
 //source is an object caused electrocuting (airlock, grille, etc)
 //No animations will be performed by this proc.
 /proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
-	if(istype(M.loc,/obj/mecha))	return 0	//feckin mechs are dumb
+	if(!istype(M)) 
+		return 0
+	if(istype(M.loc,/obj/mecha))
+		return 0	//feckin mechs are dumb
 	if(istype(M,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		if(H.gloves)
 			var/obj/item/clothing/gloves/G = H.gloves
-			if(G.siemens_coefficient == 0)	return 0		//to avoid spamming with insulated glvoes on
+			if(G.siemens_coefficient == 0)	
+				return 0		//to avoid spamming with insulated glvoes on
 
 	var/area/source_area
 	if(istype(power_source,/area))