[trunk] Ensure that only valid locations are published