diff --git a/src/lib.rs b/src/lib.rs
index f885f79..b0d7f32 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -108,6 +108,13 @@ pub struct Peer<T: std::fmt::Debug + Clone + Serialize + DeserializeOwned + Send
     receiver: Receiver<ListenerMessage<T>>,
     messages: VecDeque<PeerMessage<T>>,
 }
+impl<T: std::fmt::Debug + Clone + Serialize + DeserializeOwned + Send + Sync + 'static> Drop
+    for Peer<T>
+{
+    fn drop(&mut self) {
+        self.closed.store(true, Ordering::Relaxed);
+    }
+}
 
 impl<T: std::fmt::Debug + Clone + Serialize + DeserializeOwned + Send + Sync + 'static> Peer<T> {
     /// Bind given port to listen to incoming messages. Creates a new Peer that
@@ -124,6 +131,11 @@ impl<T: std::fmt::Debug + Clone + Serialize + DeserializeOwned + Send + Sync + '
         spawn({
             let socket = socket.clone();
             let closed = closed.clone();
+
+            if let Err(e) = socket.set_nonblocking(true) {
+                sender.send(ListenerMessage::Error(e)).ok();
+            }
+
             move || {
                 let mut listener = Listener::new(socket, sender);
 
diff --git a/src/listener.rs b/src/listener.rs
index a604c00..de0784b 100644
--- a/src/listener.rs
+++ b/src/listener.rs
@@ -1,5 +1,5 @@
 use std::{
-    io::Cursor,
+    io::{self, Cursor},
     marker::PhantomData,
     net::{SocketAddr, UdpSocket},
     sync::{Arc, mpsc::Sender},
@@ -49,6 +49,7 @@ impl<'a, T: Clone + Serialize + DeserializeOwned> Listener<T> {
                 }
                 .ok();
             }
+            Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {}
             Err(err) => {
                 self.sender.send(ListenerMessage::Error(err)).ok();
             }