diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 96fe50f..8c0275e 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -800,15 +800,16 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	 * if we have zero or one live subpath due to constraint exclusion.)
 	 */
 	if (subpaths_valid)
+	{
 		add_path(rel, (Path *) create_append_path(rel, subpaths, NULL));
 
-	/*
-	 * Also build unparameterized MergeAppend paths based on the collected
-	 * list of child pathkeys.
-	 */
-	if (subpaths_valid)
+		/*
+		 * Also build unparameterized MergeAppend paths based on the collected
+		 * list of child pathkeys.
+		 */
 		generate_mergeappend_paths(root, rel, live_childrels,
 								   all_child_pathkeys);
+	}
 
 	/*
 	 * Build Append paths for each parameterization seen among the child rels.
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b631680..db8b1eb 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -920,6 +920,9 @@ pqGetErrorNotice3(PGconn *conn, bool isError)
 	}
 	if (conn->verbosity == PQERRORS_VERBOSE)
 	{
+		const char *valf;
+		const char *vall;
+
 		val = PQresultErrorField(res, PG_DIAG_SCHEMA_NAME);
 		if (val)
 			appendPQExpBuffer(&workBuf,
@@ -940,11 +943,6 @@ pqGetErrorNotice3(PGconn *conn, bool isError)
 		if (val)
 			appendPQExpBuffer(&workBuf,
 							  libpq_gettext("CONSTRAINT NAME:  %s\n"), val);
-	}
-	if (conn->verbosity == PQERRORS_VERBOSE)
-	{
-		const char *valf;
-		const char *vall;
 
 		valf = PQresultErrorField(res, PG_DIAG_SOURCE_FILE);
 		vall = PQresultErrorField(res, PG_DIAG_SOURCE_LINE);