diff --git a/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs b/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs
index 0549f7fe2..9e9de525a 100644
--- a/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs
+++ b/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs
@@ -45,7 +45,7 @@ public IReadOnlyList<RunStepUpdateCodeInterpreterOutput> CodeInterpreterOutputs
         => _asCodeCall?.CodeInterpreter?.Outputs;
 
     /// <inheritdoc cref="InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Name"/>
-    public string FunctionName => _asFunctionCall.Function?.Name;
+    public string FunctionName => _asFunctionCall?.Function?.Name;
 
     /// <inheritdoc cref="InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Arguments"/>
     public string FunctionArguments => _asFunctionCall?.Function?.Arguments;
diff --git a/tests/Assistants/AssistantsTests.cs b/tests/Assistants/AssistantsTests.cs
index 0bda08bc1..8992714a7 100644
--- a/tests/Assistants/AssistantsTests.cs
+++ b/tests/Assistants/AssistantsTests.cs
@@ -1015,6 +1015,12 @@ public async Task BasicFileSearchStreamingWorks()
                 {
                     message += $"{contentUpdate.Text}";
                 }
+                else if (update is RunStepDetailsUpdate detailUpdate)
+                {
+                    string? functionName = "none"; // expect null assignment on next line
+                    Assert.DoesNotThrow(() => functionName = detailUpdate.FunctionName);
+                    Assert.Null(functionName);
+                }
             }
         }
         else