diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 5397de4e05..4b44a4a4ea 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -3023,7 +3023,7 @@ ExecBuildAggTrans(AggState *aggstate, AggStatePerPhase phase,
 		 * just keep the prior transValue. This is true for both plain and
 		 * sorted/distinct aggregates.
 		 */
-		if (trans_fcinfo->flinfo->fn_strict && numInputs > 0)
+		if (trans_fcinfo->flinfo->fn_strict && pertrans->numTransInputs > 0)
 		{
 			scratch.opcode = EEOP_AGG_STRICT_INPUT_CHECK;
 			scratch.d.agg_strict_input_check.nulls = strictnulls;
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index e5fe116acb..4225877478 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -2124,6 +2124,8 @@ llvm_compile_expr(ExprState *state)
 					LLVMValueRef v_nullp;
 					LLVMBasicBlockRef *b_checknulls;
 
+					Assert(nargs > 0);
+
 					jumpnull = op->d.agg_strict_input_check.jumpnull;
 					v_nullp = l_ptr_const(nulls, l_ptr(TypeStorageBool));