From e0796caf566e8236d75d9cbee94b112b5aa733bf Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 28 Oct 2014 18:43:48 +0100
Subject: [PATCH] Fixes #6871. Fixes #6821.

Amended to match the formatting in #6846, to hopefully avoid merge issues.
---
 code/game/objects/items/weapons/extinguisher.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 652e51e95c..3ca5c0d2ae 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -126,7 +126,10 @@
 					if(!W) return
 					W.reagents.reaction(get_turf(W))
 					for(var/atom/atm in get_turf(W))
-						if(!W) return
+						if(!W)
+							return
+						if(!W.reagents)
+							break
 						W.reagents.reaction(atm)
 					if(W.loc == my_target) break
 					sleep(2)