diff --git a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs index 482cb7683..c6ca54d4c 100644 --- a/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs +++ b/src/DurableTask.AzureStorage/AzureStorageOrchestrationService.cs @@ -1100,8 +1100,8 @@ await this.trackingStore.UpdateStatusForTerminationAsync( runtimeState.OrchestrationStatus != OrchestrationStatus.Suspended) { InstanceStatus instanceStatus = await this.trackingStore.FetchInstanceStatusAsync(runtimeState.OrchestrationInstance.InstanceId); - if (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId - && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus) + if (instanceStatus == null || (instanceStatus.State.OrchestrationInstance.ExecutionId == runtimeState.OrchestrationInstance.ExecutionId + && instanceStatus.State.OrchestrationStatus != runtimeState.OrchestrationStatus)) { await this.trackingStore.UpdateInstanceStatusAndDeleteOrphanedBlobsForCompletedOrchestrationAsync( runtimeState.OrchestrationInstance.InstanceId,