diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm
index c91d16e05f8..1e73075f7aa 100644
--- a/code/LINDA/LINDA_turf_tile.dm
+++ b/code/LINDA/LINDA_turf_tile.dm
@@ -319,6 +319,7 @@ atom/movable/proc/experience_pressure_difference(pressure_difference, direction)
 	var/datum/gas/sleeping_agent/S = new
 	A.trace_gases += S
 	for(var/turf/simulated/T in turf_list)
+		if(T == null || !istype(T))	return
 		A.oxygen 		+= T.air.oxygen
 		A.carbon_dioxide+= T.air.carbon_dioxide
 		A.nitrogen 		+= T.air.nitrogen
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 24758c657fc..64f9bc02add 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -926,7 +926,8 @@ About the new airlock wires panel:
 	if(visible && !glass)
 		SetOpacity(1)
 	operating = 0
-	air_update_turf()
+	air_update_turf(1)
+	update_freelok_sight()
 	if(locate(/mob/living) in get_turf(src))
 		open()