From 20a75791568a2ae9bbf6d9a4ce9e0f6b896e4538 Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Tue, 23 Apr 2019 14:48:51 +0200
Subject: [PATCH] Fix issues in ApplicationMessageInterceptor.

---
 Source/MQTTnet/Server/MqttClientSessionsManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/MQTTnet/Server/MqttClientSessionsManager.cs b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
index cd1aa1a2..b2374704 100644
--- a/Source/MQTTnet/Server/MqttClientSessionsManager.cs
+++ b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
@@ -186,7 +186,10 @@ namespace MQTTnet.Server
                 {
                     if (interceptorContext.CloseConnection)
                     {
-                        await queuedApplicationMessage.Sender.StopAsync().ConfigureAwait(false);
+                        if (sender != null)
+                        {
+                            await sender.StopAsync().ConfigureAwait(false);
+                        }
                     }
 
                     if (interceptorContext.ApplicationMessage == null || !interceptorContext.AcceptPublish)
@@ -207,7 +210,7 @@ namespace MQTTnet.Server
                 foreach (var clientSession in _sessions.Values)
                 {
                     clientSession.EnqueueApplicationMessage(
-                        queuedApplicationMessage.ApplicationMessage,
+                        applicationMessage,
                         sender?.ClientId,
                         false);
                 }