diff --git a/src/p2p/network.rs b/src/p2p/network.rs
index a83b4b2..71276d3 100644
--- a/src/p2p/network.rs
+++ b/src/p2p/network.rs
@@ -330,7 +330,7 @@ fn handle_message(context: Arc<Mutex<Context>>, message: Message, peers: &mut Pe
                 let mut context = context.lock().unwrap();
                 match context.blockchain.add_block(block) {
                     Ok(_) => { context.bus.post(crate::event::Event::BlockchainChanged); }
-                    Err(_) => { warn!("Error adding received block"); }
+                    Err(_) => { warn!("Discarded received block"); }
                 }
             });
             State::idle()
diff --git a/src/p2p/peers.rs b/src/p2p/peers.rs
index 9a98b3d..fe26da4 100644
--- a/src/p2p/peers.rs
+++ b/src/p2p/peers.rs
@@ -73,6 +73,14 @@ impl Peers {
                 continue;
             }
 
+            if self.new_peers
+                .iter()
+                .find(|a| a.clone().eq(&addr))
+                .is_some() {
+                debug!("Skipping address from exchange: {}", &addr);
+                continue;
+            }
+
             if skip_addr(&addr) {
                 debug!("Skipping address from exchange: {}", &addr);
                 continue; // Return error in future