From 40fadfcb4f7decc364f3f875fcd5723d81145ad8 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@airbnb.com>
Date: Thu, 31 May 2018 21:00:20 -0700
Subject: [PATCH] adding null checks to adhoc filter popover (#5111)

---
 .../components/AdhocFilterEditPopoverSimpleTabContent.jsx   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx b/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx
index bf8fa1d3e6d66..222772a464bf3 100644
--- a/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx
+++ b/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx
@@ -141,8 +141,10 @@ export default class AdhocFilterEditPopoverSimpleTabContent extends React.Compon
 
   handleMultiComparatorInputHeightChange() {
     if (this.multiComparatorComponent) {
-      // eslint-disable-next-line no-underscore-dangle
-      const multiComparatorDOMNode = this.multiComparatorComponent._selectRef.select.control;
+      /* eslint-disable no-underscore-dangle */
+      const multiComparatorDOMNode = this.multiComparatorComponent._selectRef &&
+        this.multiComparatorComponent._selectRef.select &&
+        this.multiComparatorComponent._selectRef.select.control;
       if (multiComparatorDOMNode) {
         if (multiComparatorDOMNode.clientHeight !== this.state.multiComparatorHeight) {
           this.props.onHeightChange((