diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 43dada83ca9..17b5756e581 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -360,6 +360,7 @@
 					constructionStep = CONSTRUCTION_WIRES_EXPOSED
 					update_icon()
 				return
+		if(CONSTRUCTION_NOCIRCUIT)
 			if(istype(C, /obj/item/firelock_electronics))
 				user.visible_message("<span class='notice'>[user] starts adding [C] to [src]...</span>", \
 									 "<span class='notice'>You begin adding a circuit board to [src]...</span>")
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index e054ae59ace..f1ac4e88bbb 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -442,7 +442,8 @@ Class Procs:
 	return FALSE
 
 /obj/machinery/default_unfasten_wrench(mob/user, obj/item/I, time)
-	if(..())
+	. = ..()
+	if(.)
 		power_change()
 
 /obj/machinery/proc/exchange_parts(mob/user, obj/item/storage/part_replacer/W)