diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 85e3b9d913..52b1ba927e 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -550,9 +550,8 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 		if ((conn->sasl_mechs_denied && found)
 			|| (!conn->sasl_mechs_denied && !found))
 		{
-			appendPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("auth method \"%s\" requirement failed: server requested unacceptable SASL mechanism \"%s\"\n"),
-							  conn->require_auth, selected_mechanism);
+			libpq_append_conn_error(conn, "auth method \"%s\" requirement failed: server requested unacceptable SASL mechanism \"%s\"",
+									conn->require_auth, selected_mechanism);
 			goto error;
 		}
 	}
@@ -904,14 +903,12 @@ check_expected_areq(AuthRequest areq, PGconn *conn)
 		 */
 		if (!conn->ssl_cert_requested)
 		{
-			appendPQExpBufferStr(&conn->errorMessage,
-								 libpq_gettext("server did not request a certificate"));
+			libpq_append_conn_error(conn, "server did not request a certificate");
 			return false;
 		}
 		else if (!conn->ssl_cert_sent)
 		{
-			appendPQExpBufferStr(&conn->errorMessage,
-								 libpq_gettext("server accepted connection without a valid certificate"));
+			libpq_append_conn_error(conn, "server accepted connection without a valid certificate");
 			return false;
 		}
 	}
@@ -997,10 +994,8 @@ check_expected_areq(AuthRequest areq, PGconn *conn)
 		if (!reason)
 			reason = auth_description(areq);
 
-		appendPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("auth method \"%s\" requirement failed: %s\n"),
-						  conn->require_auth, reason);
-
+		libpq_append_conn_error(conn, "auth method \"%s\" requirement failed: %s",
+								conn->require_auth, reason);
 		return result;
 	}
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index f40af2a4f9..46fc8e4940 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1307,9 +1307,8 @@ connectOptions2(PGconn *conn)
 				else if (!negated)
 				{
 					conn->status = CONNECTION_BAD;
-					appendPQExpBuffer(&conn->errorMessage,
-									  libpq_gettext("negative require_auth method \"%s\" cannot be mixed with non-negative methods"),
-									  method);
+					libpq_append_conn_error(conn, "negative require_auth method \"%s\" cannot be mixed with non-negative methods",
+											method);
 
 					free(part);
 					return false;
@@ -1321,9 +1320,8 @@ connectOptions2(PGconn *conn)
 			else if (negated)
 			{
 				conn->status = CONNECTION_BAD;
-				appendPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("require_auth method \"%s\" cannot be mixed with negative methods"),
-								  method);
+				libpq_append_conn_error(conn, "require_auth method \"%s\" cannot be mixed with negative methods",
+										method);
 
 				free(part);
 				return false;
@@ -1395,9 +1393,8 @@ connectOptions2(PGconn *conn)
 			else
 			{
 				conn->status = CONNECTION_BAD;
-				appendPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("invalid require_auth method: \"%s\""),
-								  method);
+				libpq_append_conn_error(conn, "invalid require_auth method: \"%s\"",
+										method);
 
 				free(part);
 				return false;
@@ -1428,9 +1425,8 @@ duplicate:
 			 * typos are extremely risky.
 			 */
 			conn->status = CONNECTION_BAD;
-			appendPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("require_auth method \"%s\" is specified more than once"),
-							  part);
+			libpq_append_conn_error(conn, "require_auth method \"%s\" is specified more than once",
+									part);
 
 			free(part);
 			return false;
@@ -1551,19 +1547,16 @@ duplicate:
 			strcmp(conn->sslcertmode, "require") != 0)
 		{
 			conn->status = CONNECTION_BAD;
-			appendPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("invalid %s value: \"%s\"\n"),
-							  "sslcertmode",
-							  conn->sslcertmode);
+			libpq_append_conn_error(conn, "invalid %s value: \"%s\"",
+									"sslcertmode", conn->sslcertmode);
 			return false;
 		}
 #ifndef USE_SSL
 		if (strcmp(conn->sslcertmode, "require") == 0)
 		{
 			conn->status = CONNECTION_BAD;
-			appendPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("sslcertmode value \"%s\" invalid when SSL support is not compiled in\n"),
-							  conn->sslcertmode);
+			libpq_append_conn_error(conn, "sslcertmode value \"%s\" invalid when SSL support is not compiled in",
+									conn->sslcertmode);
 			return false;
 		}
 #endif
@@ -1576,9 +1569,8 @@ duplicate:
 		if (strcmp(conn->sslcertmode, "require") == 0)
 		{
 			conn->status = CONNECTION_BAD;
-			appendPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("sslcertmode value \"%s\" is not supported (check OpenSSL version)\n"),
-							  conn->sslcertmode);
+			libpq_append_conn_error(conn, "sslcertmode value \"%s\" is not supported (check OpenSSL version)",
+									conn->sslcertmode);
 			return false;
 		}
 #endif
