From dc396ddb57ac9b35585a4e93e4c1428ae04dbc98 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Mon, 12 Nov 2012 02:24:28 +0200
Subject: [PATCH] Fix for Issue 1868

---
 code/ATMOSPHERICS/components/unary/vent_pump.dm     | 3 ++-
 code/ATMOSPHERICS/components/unary/vent_scrubber.dm | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index b58a12b8b80..4a75d6576eb 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -324,6 +324,7 @@
 			del(src)
 
 	/obj/machinery/atmospherics/unary/vent_pump/Del()
-		initial_loc.air_scrub_info -= id_tag
+		if (initial_loc)
+			initial_loc.air_scrub_info -= id_tag
 		..()
 		return
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index 21484d25e19..57cfc501461 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -260,6 +260,7 @@
 			del(src)
 
 	/obj/machinery/atmospherics/unary/vent_scrubber/Del()
-		initial_loc.air_scrub_info -= id_tag
+		if (initial_loc)
+			initial_loc.air_scrub_info -= id_tag
 		..()
 		return