diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index a08f23535290cfcccf68adafaaa9d92dea26de50..96146e0fda0c9123f5210d9f4deca3840e3ae81a 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -689,9 +689,9 @@ int8inc(PG_FUNCTION_ARGS)
 		int64	   *arg = (int64 *) PG_GETARG_POINTER(0);
 		int64		result;
 
-		result = arg + 1;
+		result = *arg + 1;
 		/* Overflow check */
-		if (result < 0 && arg > 0)
+		if (result < 0 && *arg > 0)
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 8ea193855768356a9c2b6ae658ebdc44c019100d..95bec7568037d6b667fece2232fcee9217c68b3d 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -5809,10 +5809,7 @@ get_variable(Var *var, int levelsup, bool istoplevel, deparse_context *context)
 
 		tle = get_tle_by_resno(dpns->outer_tlist, var->varattno);
 		if (!tle)
-		{
 			elog(ERROR, "bogus varattno for OUTER_VAR var: %d", var->varattno);
-			return NULL;
-		}
 
 		Assert(netlevelsup == 0);
 		push_child_plan(dpns, dpns->outer_planstate, &save_dpns);