diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index a08db6cd9d2..fdc5a445b98 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -333,9 +333,11 @@
 		else if(!bumped)
 			tracer_effect(effect_transform)
 
-		if(incendiary >= 2 && !istype(src.loc, /turf/simulated/wall))
-			var/trail_volume = (flammability * 0.20)
-			new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir)
+		if(incendiary >= 2) //This should cover the bases of 'Why is there fuel here?' in a much cleaner way than previous.
+			if(src && src.loc) //Safety.
+				if(!src.loc.density)
+					var/trail_volume = (flammability * 0.20)
+					new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir)
 
 		if(!hitscan)
 			sleep(step_delay)	//add delay between movement iterations if it's not a hitscan weapon
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 5b95ee66397..283e487272b 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -272,6 +272,7 @@
 	flammability = 4
 	agony = 30
 	kill_count = 4
+	vacuum_traversal = 0
 
 /obj/item/projectile/bullet/incendiary/flamethrower/large
 	damage = 15