diff --git a/src/messaging.rs b/src/messaging.rs
index f9ce40d..60728f2 100644
--- a/src/messaging.rs
+++ b/src/messaging.rs
@@ -284,12 +284,7 @@ impl<'a, HandlerError: AlgoError> MessageLoop<'a, HandlerError> {
                 } => {
                     self.remote_txs.iter().fold(result, |result1, (uid, tx)| {
                         if result1.is_err() { result1 } else {
-                            if let Some(tx) = self.remote_txs.get(&uid) {
-                                tx.send(message.clone()).map_err(Error::from)
-                            }
-                            else {
-                                Err(Error::SendError)
-                            }
+                            tx.send(message.clone()).map_err(Error::from)
                         }
                     })
                 }
diff --git a/tests/broadcast.rs b/tests/broadcast.rs
index aeac225..27fbe99 100644
--- a/tests/broadcast.rs
+++ b/tests/broadcast.rs
@@ -68,7 +68,7 @@ impl<'a> TestNode<'a>
 
     pub fn run(&'a self) -> Result<HashSet<ProposedValue>, Error>
     {
-        let node0_uid = "127.0.0.1:0".parse().unwrap();
+        let node0_uid = node_addr(0);
         self.message_loop.insert_algo(Algorithm::Broadcast(node0_uid), self);
 
         Err(Error::NotImplemented)