Mappers kidnapped... Move that portal too please?

Sooo, I'm very grateful for having the spawn point further away from the exit portal when rescuing sailors, but F*** does it hurt losing your mappers to accidentally exiting the rescue area. If a team of good mappers wasn't so hard to come by, I'd be chillin. But damn this is actually VERY annoying. Can't you guys just remove the exit points on the first hand? Also we still don't know how much the ransom is. :)