diff --git a/src/Console.Sample/Program.cs b/src/Console.Sample/Program.cs
index a28ba10..7bfb2f2 100644
--- a/src/Console.Sample/Program.cs
+++ b/src/Console.Sample/Program.cs
@@ -18,7 +18,7 @@ internal class Program
 
         private static OpenClient _client;
 
-        private static readonly List<IDisposable> _disposables = new List<IDisposable>();
+        private static readonly List<IDisposable> _disposables = new();
 
         private static async Task Main()
         {
@@ -298,6 +298,13 @@ private static void ProcessSubscriptionCommand(string[] commandSplit)
 
         private static async void RefreshToken()
         {
+            if (string.IsNullOrWhiteSpace(_token.RefreshToken))
+            {
+                Console.Write("Refresh Token: ");
+
+                _token.RefreshToken = Console.ReadLine();
+            }
+
             Console.WriteLine("Sending ProtoOARefreshTokenReq...");
 
             var request = new ProtoOARefreshTokenReq
diff --git a/src/OpenAPI.Net/OpenAPI.Net.csproj b/src/OpenAPI.Net/OpenAPI.Net.csproj
index c580b18..7b73bde 100644
--- a/src/OpenAPI.Net/OpenAPI.Net.csproj
+++ b/src/OpenAPI.Net/OpenAPI.Net.csproj
@@ -9,7 +9,7 @@
     <PackageTags>cTrader, Open API, Spotware</PackageTags>
     <Description>A .NET RX library for Spotware Open API</Description>
     <PackageId>Spotware.OpenAPI.Net</PackageId>
-    <Version>1.3.9-rc0</Version>
+    <Version>1.3.9</Version>
     <Platforms>AnyCPU</Platforms>
     <Company>Spotware</Company>
     <Authors>Spotware</Authors>
diff --git a/src/OpenAPI.Net/OpenClient.cs b/src/OpenAPI.Net/OpenClient.cs
index 4b821cb..fc0d3ef 100644
--- a/src/OpenAPI.Net/OpenClient.cs
+++ b/src/OpenAPI.Net/OpenClient.cs
@@ -169,8 +169,7 @@ public IDisposable Subscribe(IObserver<IMessage> observer)
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <exception cref="InvalidOperationException">If getting message payload type fails</exception>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message.GetPayloadType(), message.ToByteString(), clientMsgId);
             
@@ -185,8 +184,7 @@ public async Task SendMessage<T>(T message, string clientMsgId = null) where T :
         /// <param name="payloadType">Message Payload Type (ProtoPayloadType)</param>
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message, payloadType, clientMsgId);
 
@@ -201,8 +199,7 @@ public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string
         /// <param name="payloadType">Message Payload Type (ProtoOAPayloadType)</param>
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, ProtoOAPayloadType payloadType, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, ProtoOAPayloadType payloadType, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message, payloadType, clientMsgId);
 
@@ -457,7 +454,14 @@ private async void SendHeartbeat()
         {
             if (IsDisposed || DateTimeOffset.Now - LastSentMessageTime < _heartbeatInerval) return;
 
-            await SendMessage(_heartbeatEvent, ProtoPayloadType.HeartbeatEvent).ConfigureAwait(false);
+            try
+            {
+                await SendMessage(_heartbeatEvent, ProtoPayloadType.HeartbeatEvent).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                OnError(ex);
+            }
         }
 
         /// <summary>