diff --git a/src/services/Elastic.Documentation.Search/ChangesGateway.cs b/src/services/Elastic.Documentation.Search/ChangesGateway.cs
index 36a768932..ecd4b3576 100644
--- a/src/services/Elastic.Documentation.Search/ChangesGateway.cs
+++ b/src/services/Elastic.Documentation.Search/ChangesGateway.cs
@@ -39,7 +39,7 @@ public async Task<ChangesResult> GetChangesAsync(ChangesRequest request, Cancel
 
 			if (!response.IsValidResponse)
 			{
-				var reason = response.ElasticsearchServerError?.Error.Reason ?? "Unknown";
+				var reason = response.ElasticsearchServerError?.Error?.Reason ?? "Unknown";
 				throw new InvalidOperationException(
 					$"Elasticsearch changes query failed (HTTP {response.ApiCallDetails?.HttpStatusCode}): {reason}"
 				);
@@ -97,9 +97,9 @@ await clientAccessor.Client.SearchAsync<DocumentationDocument>(s =>
 		}, ctx);
 
 	private static bool IsExpiredPit(SearchResponse<DocumentationDocument> response) =>
-		response.ElasticsearchServerError?.Error.Type is "search_phase_execution_exception"
-		|| response.ElasticsearchServerError?.Error.Reason?.Contains("point in time", StringComparison.OrdinalIgnoreCase) == true
-		|| response.ElasticsearchServerError?.Error.Reason?.Contains("No search context found", StringComparison.OrdinalIgnoreCase) == true;
+		response.ElasticsearchServerError?.Error?.Type is "search_phase_execution_exception"
+		|| response.ElasticsearchServerError?.Error?.Reason?.Contains("point in time", StringComparison.OrdinalIgnoreCase) == true
+		|| response.ElasticsearchServerError?.Error?.Reason?.Contains("No search context found", StringComparison.OrdinalIgnoreCase) == true;
 
 	private static ChangesResult BuildResult(SearchResponse<DocumentationDocument> response, int pageSize)
 	{
diff --git a/src/services/Elastic.Documentation.Search/SharedPointInTimeManager.cs b/src/services/Elastic.Documentation.Search/SharedPointInTimeManager.cs
index 286fcc66c..1b0f6b637 100644
--- a/src/services/Elastic.Documentation.Search/SharedPointInTimeManager.cs
+++ b/src/services/Elastic.Documentation.Search/SharedPointInTimeManager.cs
@@ -62,7 +62,7 @@ private async Task<string> OpenPit(Cancel ctx)
 		if (!response.IsValidResponse)
 		{
 			throw new InvalidOperationException(
-				$"Failed to open PIT: {response.ElasticsearchServerError?.Error.Reason ?? "Unknown"}"
+				$"Failed to open PIT: {response.ElasticsearchServerError?.Error?.Reason ?? "Unknown"}"
 			);
 		}