diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index 21604f9e9c..d28c9d9b81 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -1452,7 +1452,6 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 		RangeTblEntry *rte = root->simple_rte_array[relid];
 		ScalarArrayOpExpr *expr = (ScalarArrayOpExpr *) clause;
 		Node	   *clause_expr;
-		Const	   *cst;
 		bool		expronleft;
 
 		/* Only expressions with two arguments are considered compatible. */
@@ -1460,11 +1459,11 @@ statext_is_compatible_clause_internal(PlannerInfo *root, Node *clause,
 			return false;
 
 		/* Check if the expression has the right shape (one Var, one Const) */
-		if (!examine_opclause_args(expr->args, &clause_expr, &cst, &expronleft))
+		if (!examine_opclause_args(expr->args, &clause_expr, NULL, &expronleft))
 			return false;
 
-		/* We only support Var on left and non-null array constants */
-		if (!expronleft || cst->constisnull)
+		/* We only support Var on left, Const on right */
+		if (!expronleft)
 			return false;
 
 		/*
diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
index 50c65c3fde..0183775853 100644
--- a/src/backend/statistics/mcv.c
+++ b/src/backend/statistics/mcv.c
@@ -1740,17 +1740,24 @@ mcv_get_match_bitmap(PlannerInfo *root, List *clauses,
 			if (!examine_opclause_args(expr->args, &clause_expr, &cst, &expronleft))
 				elog(ERROR, "incompatible clause");
 
-			/* We expect Var on left and non-null constant on right */
-			if (!expronleft || cst->constisnull)
+			/* We expect Var on left */
+			if (!expronleft)
 				elog(ERROR, "incompatible clause");
 
-			arrayval = DatumGetArrayTypeP(cst->constvalue);
-			get_typlenbyvalalign(ARR_ELEMTYPE(arrayval),
-								 &elmlen, &elmbyval, &elmalign);
-			deconstruct_array(arrayval,
-							  ARR_ELEMTYPE(arrayval),
-							  elmlen, elmbyval, elmalign,
-							  &elem_values, &elem_nulls, &num_elems);
+			/*
+			 * Deconstruct the array constant, unless it's NULL (we'll cover
+			 * that case below)
+			 */
+			if (!cst->constisnull)
+			{
+				arrayval = DatumGetArrayTypeP(cst->constvalue);
+				get_typlenbyvalalign(ARR_ELEMTYPE(arrayval),
+									 &elmlen, &elmbyval, &elmalign);
+				deconstruct_array(arrayval,
+								  ARR_ELEMTYPE(arrayval),
+								  elmlen, elmbyval, elmalign,
+								  &elem_values, &elem_nulls, &num_elems);
+			}
 
 			/* match the attribute/expression to a dimension of the statistic */
 			idx = mcv_match_expression(clause_expr, keys, exprs, &collid);