From 789d5b9ef9256ffd9914290163823ede4c45a223 Mon Sep 17 00:00:00 2001
From: aykut-bozkurt <51649454+aykut-bozkurt@users.noreply.github.com>
Date: Thu, 28 Jul 2022 13:13:28 +0300
Subject: [PATCH] null check for server in GetObjectAddressByServerName (#6095)

---
 src/backend/distributed/commands/foreign_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/distributed/commands/foreign_server.c b/src/backend/distributed/commands/foreign_server.c
index d98393e48..b8fcf0412 100644
--- a/src/backend/distributed/commands/foreign_server.c
+++ b/src/backend/distributed/commands/foreign_server.c
@@ -269,7 +269,7 @@ static List *
 GetObjectAddressByServerName(char *serverName, bool missing_ok)
 {
 	ForeignServer *server = GetForeignServerByName(serverName, missing_ok);
-	Oid serverOid = server->serverid;
+	Oid serverOid = (server) ? server->serverid : InvalidOid;
 	ObjectAddress *address = palloc0(sizeof(ObjectAddress));
 	ObjectAddressSet(*address, ForeignServerRelationId, serverOid);