diff --git a/veilid-core/src/crypto/mod.rs b/veilid-core/src/crypto/mod.rs
index 966633dd..879b5194 100644
--- a/veilid-core/src/crypto/mod.rs
+++ b/veilid-core/src/crypto/mod.rs
@@ -146,17 +146,9 @@ impl Crypto {
         {
             let c = self.unlocked_inner.config.get();
             for ck in VALID_CRYPTO_KINDS {
-                cache_validity_key.append(
-                    &mut c
-                        .network
-                        .routing_table
-                        .node_id
-                        .get(ck)
-                        .unwrap()
-                        .value
-                        .bytes
-                        .to_vec(),
-                );
+                if let Some(nid) = c.network.routing_table.node_id.get(ck) {
+                    cache_validity_key.append(&mut nid.value.bytes.to_vec());
+                }
             }
         };
 
diff --git a/veilid-core/src/routing_table/mod.rs b/veilid-core/src/routing_table/mod.rs
index 97279d08..42b4be0f 100644
--- a/veilid-core/src/routing_table/mod.rs
+++ b/veilid-core/src/routing_table/mod.rs
@@ -351,17 +351,9 @@ impl RoutingTable {
         {
             let c = self.unlocked_inner.config.get();
             for ck in VALID_CRYPTO_KINDS {
-                cache_validity_key.append(
-                    &mut c
-                        .network
-                        .routing_table
-                        .node_id
-                        .get(ck)
-                        .unwrap()
-                        .value
-                        .bytes
-                        .to_vec(),
-                );
+                if let Some(nid) = c.network.routing_table.node_id.get(ck) {
+                    cache_validity_key.append(&mut nid.value.bytes.to_vec());
+                }
             }
             for b in &c.network.routing_table.bootstrap {
                 cache_validity_key.append(&mut b.as_bytes().to_vec());
diff --git a/veilid-server/src/settings.rs b/veilid-server/src/settings.rs
index a38d861b..0fc09ce9 100644
--- a/veilid-server/src/settings.rs
+++ b/veilid-server/src/settings.rs
@@ -1580,7 +1580,7 @@ mod tests {
         //
         assert_eq!(
             s.core.network.routing_table.bootstrap,
-            vec!["bootstrap.dev.veilid.net".to_owned()]
+            vec!["bootstrap.veilid.net".to_owned()]
         );
         //
         assert_eq!(s.core.network.rpc.concurrency, 0);