From aebd577dd6f744f292b64f811adf4b9019db3bdb Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Thu, 12 Dec 2019 15:07:40 -0700
Subject: [PATCH] Adds null check in WaitAndTryReconnect()

---
 .../Pepperdash Core/Comm/GenericTcpIpClient.cs           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 3fb5e0a..53349df 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -317,11 +317,16 @@ namespace PepperDash.Core
         /// </summary>
 		void WaitAndTryReconnect()
 		{
+            if (Client != null)
+            {
+                Debug.Console(1, "Attempting reconnect, status={0}", Client.ClientStatus);
+            }
+
             DisconnectClient();
 
-			Debug.Console(1, "Attempting reconnect, status={0}", Client.ClientStatus);
-            if(!DisconnectCalledByUser)
+            if (!DisconnectCalledByUser)
                 RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs);
+
 		}
 
         /// <summary>