diff --git a/MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs b/MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs
index d47d4cee..7084227b 100644
--- a/MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs
+++ b/MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs
@@ -151,7 +151,7 @@ namespace MQTTnet.Core.Adapter
                     receivedMqttPacket = await ReceiveAsync(_channel.ReceiveStream, cancellationToken).ConfigureAwait(false);
                 }
 
-                if (cancellationToken.IsCancellationRequested)
+                if (receivedMqttPacket == null || cancellationToken.IsCancellationRequested)
                 {
                     throw new TaskCanceledException();
                 }
@@ -190,6 +190,10 @@ namespace MQTTnet.Core.Adapter
         private static async Task<ReceivedMqttPacket> ReceiveAsync(Stream stream, CancellationToken cancellationToken)
         {
             var header = MqttPacketReader.ReadHeaderFromSource(stream, cancellationToken);
+            if (header == null)
+            {
+                return null;
+            }
 
             if (header.BodyLength == 0)
             {
diff --git a/MQTTnet.Core/Serializer/MqttPacketReader.cs b/MQTTnet.Core/Serializer/MqttPacketReader.cs
index ce80cd50..97b6478c 100644
--- a/MQTTnet.Core/Serializer/MqttPacketReader.cs
+++ b/MQTTnet.Core/Serializer/MqttPacketReader.cs
@@ -25,7 +25,13 @@ namespace MQTTnet.Core.Serializer
 
         public static MqttPacketHeader ReadHeaderFromSource(Stream stream, CancellationToken cancellationToken)
         {
-            var fixedHeader = (byte)stream.ReadByte();
+            var buffer = stream.ReadByte();
+            if (buffer == -1)
+            {
+                return null;
+            }
+
+            var fixedHeader = (byte)buffer;
             var controlPacketType = (MqttControlPacketType)(fixedHeader >> 4);
             var bodyLength = ReadBodyLengthFromSource(stream, cancellationToken);
 
@@ -83,10 +89,10 @@ namespace MQTTnet.Core.Serializer
                 var buffer = stream.ReadByte();
                 readBytes.Add(buffer);
 
-                ////if (buffer == -1)
-                ////{
-                ////    break;
-                ////}
+                if (buffer == -1)
+                {
+                    break;
+                }
 
                 encodedByte = (byte)buffer;
                 value += (byte)(encodedByte & 127) * multiplier;