From d973a94b71205b0d52953882d2fd0680e23d789d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Tam=C3=A1si?= <zoltantamasi@pro-sharp.hu>
Date: Fri, 4 Sep 2026 16:51:41 +0200
Subject: [PATCH] Added null-handling when recording host startup exception to
 current activity

---
 src/WorkflowCore/Services/WorkflowHost.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/WorkflowCore/Services/WorkflowHost.cs b/src/WorkflowCore/Services/WorkflowHost.cs
index 6f3195cb..f9702b7d 100644
--- a/src/WorkflowCore/Services/WorkflowHost.cs
+++ b/src/WorkflowCore/Services/WorkflowHost.cs
@@ -49,7 +49,7 @@ public WorkflowHost(IPersistenceProvider persistenceStore, IQueueProvider queueP
             _activityController = activityController;
             _lifeCycleEventHub = lifeCycleEventHub;
         }
-        
+
         public Task<string> StartWorkflow(string workflowId, object data = null, string reference=null)
         {
             return _workflowController.StartWorkflow(workflowId, data, reference);
@@ -65,7 +65,7 @@ public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, s
         {
             return _workflowController.StartWorkflow<TData>(workflowId, null, data, reference);
         }
-        
+
         public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
             where TData : class, new()
         {
@@ -81,7 +81,7 @@ public void Start()
         {
             StartAsync(CancellationToken.None).GetAwaiter().GetResult();
         }
-        
+
         public async Task StartAsync(CancellationToken cancellationToken)
         {
             var activity = WorkflowActivity.StartHost();
@@ -105,7 +105,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             }
             catch (Exception ex)
             {
-                activity.AddException(ex);
+                activity?.AddException(ex);
                 throw;
             }
             finally
@@ -118,7 +118,7 @@ public void Stop()
         {
             StopAsync(CancellationToken.None).GetAwaiter().GetResult();
         }
-        
+
         public async Task StopAsync(CancellationToken cancellationToken)
         {
             _shutdown = true;