diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 223d7101641..65beaf3c880 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -664,7 +664,7 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
 			free(conn->sslmode);
 		conn->sslmode = strdup("require");
 		if (!conn->sslmode)
-			return false;
+			goto oom_error;
 	}
 #endif
 	FILL_CONN_OPTION(conn->requirepeer, "requirepeer");
@@ -767,7 +767,6 @@ connectOptions2(PGconn *conn)
 			conn->pgpass = strdup(DefaultPassword);
 			if (!conn->pgpass)
 				goto oom_error;
-
 		}
 		else
 			conn->dot_pgpass_used = true;