diff --git a/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.cpp b/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.cpp
index 029f5e300c..ced1f83c3b 100644
--- a/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.cpp
+++ b/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.cpp
@@ -58,34 +58,46 @@ namespace CefSharp
         {
             auto channelFactory = browser->ChannelFactory;
 
-            try
+            //Add null check for issue https://github.com/cefsharp/CefSharp/issues/2839
+            if (channelFactory == nullptr)
             {
-                if (channelFactory->State == CommunicationState::Opened)
-                {
-                    channelFactory->Close();
-                }
+                LOG(ERROR) << "WcfEnabledSubProcess::OnBrowserDestroyed - browser->ChannelFactory was unexpectedly null, see https://github.com/cefsharp/CefSharp/issues/2839 for some debugging tips.";
             }
-            catch (Exception^)
+            else
             {
-                channelFactory->Abort();
+                try
+                {
+                    if (channelFactory->State == CommunicationState::Opened)
+                    {
+                        channelFactory->Close();
+                    }
+                }
+                catch (Exception^)
+                {
+                    channelFactory->Abort();
+                }
             }
 
-            auto clientChannel = ((IClientChannel^)browser->BrowserProcess);
-
-            try
+            //Add null check for issue https://github.com/cefsharp/CefSharp/issues/2839
+            if (browser->BrowserProcess != nullptr)
             {
-                if (clientChannel->State == CommunicationState::Opened)
+                auto clientChannel = ((IClientChannel^)browser->BrowserProcess);
+
+                try
                 {
-                    clientChannel->Close();
+                    if (clientChannel->State == CommunicationState::Opened)
+                    {
+                        clientChannel->Close();
+                    }
+                }
+                catch (Exception^)
+                {
+                    clientChannel->Abort();
                 }
-            }
-            catch (Exception^)
-            {
-                clientChannel->Abort();
             }
 
             browser->ChannelFactory = nullptr;
             browser->BrowserProcess = nullptr;
         }
     }
-}
\ No newline at end of file
+}