diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
index 6a05747fec8..4301ad35f04 100644
--- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs
+++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
@@ -195,12 +195,21 @@ private void OnStationShutdown(EntityUid stationUid, StationDeadDropComponent co
 
     public void CompromiseDeadDrop(EntityUid uid, DeadDropComponent _)
     {
-        //Get our station: FIXME - check lifecycle on entities before adding another drop.
+        // Remove the dead drop.
+        RemComp<DeadDropComponent>(uid);
+
+        // Get our station: FIXME - check lifecycle on entities before adding another drop.
         var station = _station.GetOwningStation(uid);
 
-        //Remove the dead drop.
-        RemComp<DeadDropComponent>(uid);
-        //Find a new potential dead drop to spawn.
+        // If station is terminating, or if we aren't on one, nothing to do here.
+        if (station == null ||
+            !station.Value.Valid ||
+            MetaData(station.Value).EntityLifeStage >= EntityLifeStage.Terminating)
+        {
+            return;
+        }
+
+        // Find a new potential dead drop to spawn.
         var deadDropQuery = EntityManager.EntityQueryEnumerator<PotentialDeadDropComponent>();
         List<(EntityUid ent, PotentialDeadDropComponent comp)> potentialDeadDrops = new();
         while (deadDropQuery.MoveNext(out var ent, out var potentialDeadDrop))
diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml
index 8c3d45770c1..14c16bd66ca 100644
--- a/Resources/Prototypes/_NF/Shipyard/camper.yml
+++ b/Resources/Prototypes/_NF/Shipyard/camper.yml
@@ -12,7 +12,7 @@
   id: Camper
   name: SSS Camper
   description: A personal camper shuttle for those who prefer to live in emptiness of space.
-  price: 12000
+  price: 17000 # Appraises at 15770, 10% markup to get tests passing - TODO: fix this
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/camper.yml