diff --git a/src/net/channel.rs b/src/net/channel.rs
index 937d9f709..87989c7cb 100644
--- a/src/net/channel.rs
+++ b/src/net/channel.rs
@@ -285,9 +285,9 @@ impl Channel {
             return Err(Error::MalformedPacket)
         }
 
-        let len = VarInt::decode_async(stream).await.unwrap().0;
+        let len = VarInt::decode_async(stream).await?.0;
         let mut take = stream.take(len);
-        let command = String::decode_async(&mut take).await.unwrap();
+        let command = String::decode_async(&mut take).await?;
 
         Ok(command)
     }
diff --git a/src/net/message_subscriber.rs b/src/net/message_subscriber.rs
index 591fad8cf..9fede93d5 100644
--- a/src/net/message_subscriber.rs
+++ b/src/net/message_subscriber.rs
@@ -195,21 +195,32 @@ impl<M: Message> MessageDispatcherInterface for MessageDispatcher<M> {
     /// We extract the message length from the stream and use `take()`
     /// to allocate an appropiately sized buffer as a basic DDOS protection.
     async fn trigger(&self, stream: &mut smol::io::ReadHalf<Box<dyn PtStream + 'static>>) {
-        // TODO: check the message length does not exceed some bound.
-        let len = VarInt::decode_async(stream).await.unwrap().0;
-        let mut take = stream.take(len);
+        match VarInt::decode_async(stream).await {
+            Ok(int) => {
+                // TODO: check the message length does not exceed some bound.
+                let len = int.0;
+                let mut take = stream.take(len);
 
-        // Deserialize stream into type, send down the pipes.
-        match M::decode_async(&mut take).await {
-            Ok(message) => {
-                let message = Ok(Arc::new(message));
-                self._trigger_all(message).await
+                // Deserialize stream into type, send down the pipes.
+                match M::decode_async(&mut take).await {
+                    Ok(message) => {
+                        let message = Ok(Arc::new(message));
+                        self._trigger_all(message).await
+                    }
+
+                    Err(err) => {
+                        error!(
+                            target: "net::message_subscriber::trigger()",
+                            "Unable to decode data. Dropping...: {}",
+                            err,
+                        );
+                    }
+                }
             }
-
             Err(err) => {
                 error!(
                     target: "net::message_subscriber::trigger()",
-                    "Unable to decode data. Dropping...: {}",
+                    "Unable to decode VarInt. Dropping...: {}",
                     err,
                 );
             }