diff --git a/bridges/bin/millau/node/src/chain_spec.rs b/bridges/bin/millau/node/src/chain_spec.rs
index 541d240b6a1ac..957ee4750c4af 100644
--- a/bridges/bin/millau/node/src/chain_spec.rs
+++ b/bridges/bin/millau/node/src/chain_spec.rs
@@ -158,7 +158,7 @@ fn testnet_genesis(
 		pallet_substrate_bridge: Some(BridgeRialtoConfig {
 			// We'll initialize the pallet with a dispatchable instead.
 			init_data: None,
-			owner: None,
+			owner: Some(root_key.clone()),
 		}),
 		pallet_sudo: Some(SudoConfig { key: root_key }),
 		pallet_session: Some(SessionConfig {
diff --git a/bridges/bin/rialto/node/src/chain_spec.rs b/bridges/bin/rialto/node/src/chain_spec.rs
index 8dd57e2d6e86b..50f141465ba12 100644
--- a/bridges/bin/rialto/node/src/chain_spec.rs
+++ b/bridges/bin/rialto/node/src/chain_spec.rs
@@ -157,7 +157,11 @@ fn testnet_genesis(
 		pallet_grandpa: Some(GrandpaConfig {
 			authorities: Vec::new(),
 		}),
-		pallet_substrate_bridge: load_millau_bridge_config(),
+		pallet_substrate_bridge: Some(BridgeMillauConfig {
+			// We'll initialize the pallet with a dispatchable instead.
+			init_data: None,
+			owner: Some(root_key.clone()),
+		}),
 		pallet_sudo: Some(SudoConfig { key: root_key }),
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities
@@ -183,10 +187,3 @@ fn load_kovan_bridge_config() -> Option<BridgeKovanConfig> {
 		initial_validators: rialto_runtime::kovan::genesis_validators(),
 	})
 }
-
-fn load_millau_bridge_config() -> Option<BridgeMillauConfig> {
-	Some(BridgeMillauConfig {
-		init_data: None,
-		owner: Some([0; 32].into()),
-	})
-}
diff --git a/bridges/relays/substrate/src/headers_target.rs b/bridges/relays/substrate/src/headers_target.rs
index 6f23706d171cb..6fb4a1500af6e 100644
--- a/bridges/relays/substrate/src/headers_target.rs
+++ b/bridges/relays/substrate/src/headers_target.rs
@@ -91,11 +91,11 @@ where
 		let decoded_response: Vec<(P::Number, P::Hash)> =
 			Decode::decode(&mut &encoded_response.0[..]).map_err(SubstrateError::ResponseParseFailed)?;
 
-		let best_header = decoded_response.last().ok_or_else(|| {
-			SubstrateError::ResponseParseFailed(
-				"Parsed an empty list of headers, we should always have at least one.".into(),
-			)
-		})?;
+		const WARNING_MSG: &str = "Parsed an empty list of headers, we should always have at least
+									one. Has the bridge pallet been initialized yet?";
+		let best_header = decoded_response
+			.last()
+			.ok_or_else(|| SubstrateError::ResponseParseFailed(WARNING_MSG.into()))?;
 		let best_header_id = HeaderId(best_header.0, best_header.1);
 		Ok(best_header_id)
 	}