diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 08010e7d521..462027d123c 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -599,7 +599,7 @@ obj/structure/door_assembly/New()
 							 "You start finishing the airlock.")
 
 		if(do_after(user, 40))
-			if(state == 2)
+			if(src.loc && state == 2)
 				user << "<span class='notice'> You've finished the airlock.</span>"
 				var/obj/machinery/door/airlock/door
 				if(mineral == "glass")
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index ac9e59686ea..8e5d20cd8c4 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -267,6 +267,7 @@ obj/structure/windoor_assembly/Destroy()
 							src.electronics.loc = windoor
 							if(created_name)
 								windoor.name = created_name
+							qdel(src)
 							windoor.close()
 
 
@@ -286,12 +287,10 @@ obj/structure/windoor_assembly/Destroy()
 							src.electronics.loc = windoor
 							if(created_name)
 								windoor.name = created_name
+							qdel(src)
 							windoor.close()
 
 
-					qdel(src)
-
-
 			else
 				..()