From a9c0aa252ed2a24764ef78f1b9cad47a4942d235 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Thu, 26 Mar 2020 10:15:49 -0400
Subject: [PATCH] Fix some null reference issues.

---
 x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts | 2 +-
 x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index 85749ac66b80c..176963a998685 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -69,7 +69,7 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
   };
 
   const result = await callES('search', params);
-  const ping: any = result.aggregations.by_id.buckets?.[0]?.latest.hits?.hits?.[0] ?? {};
+  const ping: any = result.aggregations?.by_id.buckets?.[0]?.latest.hits?.hits?.[0] ?? {};
 
   return {
     ...ping?._source,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
index 00f1fc7de4c12..a49e4c8931142 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
@@ -74,7 +74,7 @@ export const getPingHistogram: UMElasticsearchQueryFn<
   };
 
   const result = await callES('search', params);
-  const interval = result.aggregations.timeseries?.interval;
+  const interval = result.aggregations?.timeseries?.interval;
   const buckets: HistogramQueryResult[] = result?.aggregations?.timeseries?.buckets ?? [];
   const histogram = buckets.map(bucket => {
     const x: number = bucket.key;