diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
index df33523d468a..25a1ce72d83a 100644
--- a/code/game/objects/effects/effect_system/smoke.dm
+++ b/code/game/objects/effects/effect_system/smoke.dm
@@ -47,7 +47,7 @@
 		src.time_to_live += rand(-1,1)
 
 	var/area/my_area = get_area(src)
-	if(my_area.flags_area & AREA_HEAVILY_VENTILATED)
+	if(my_area?.flags_area & AREA_HEAVILY_VENTILATED)
 		var/new_amount = rand(1,3)
 		src.time_to_live = min(new_amount, src.time_to_live)
 
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index b4928ff6c07f..421d3fe91525 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -328,6 +328,7 @@
 		else
 			var/obj/effect/particle_effect/smoke/chem/checker = new()
 			var/atom/blocked = LinkBlocked(checker, source_turf, turf)
+			qdel(checker)
 			if(blocked)
 				break