diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index a8e0d681084..8f1dc21f2cc 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -176,7 +176,7 @@
 		fire_rain()
 
 	icon_state = "dragon"
-	if(swoop_target)
+	if(swoop_target && !qdeleted(swoop_target))
 		tturf = get_turf(swoop_target)
 	else
 		tturf = get_turf(src)
@@ -185,18 +185,18 @@
 	animate(src, pixel_x = 0, pixel_z = 0, time = 10)
 	sleep(10)
 	playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)
-	for(var/mob/living/L in range(1,tturf))
-		if(L == src)
-			continue
+	for(var/mob/living/L in orange(1, src))
 		if(L.stat)
 			visible_message("<span class='danger'>[src] slams down on [L], crushing them!</span>")
 			L.gib()
 		else
-			var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
 			L.adjustBruteLoss(75)
-			L.throw_at_fast(throwtarget)
-			visible_message("<span class='danger'>[L] is thrown clear of [src]!</span>")
-	for(var/mob/M in range(7,src))
+			if(L && !qdeleted(L)) // Some mobs are deleted on death
+				var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
+				L.throw_at_fast(throwtarget)
+				visible_message("<span class='danger'>[L] is thrown clear of [src]!</span>")
+
+	for(var/mob/M in range(7, src))
 		shake_camera(M, 15, 1)
 
 	stop_automated_movement = FALSE