From cf718ffe77b2c6fb9ae820c004161e87f1e0c7d1 Mon Sep 17 00:00:00 2001
From: Onur Tirtir <onurcantirtir@gmail.com>
Date: Sat, 29 Feb 2020 14:53:48 +0300
Subject: [PATCH] safely error out in DistributedTableCacheEntry function

---
 src/backend/distributed/metadata/metadata_cache.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c
index c4f1ba037..bc4204fe1 100644
--- a/src/backend/distributed/metadata/metadata_cache.c
+++ b/src/backend/distributed/metadata/metadata_cache.c
@@ -790,7 +790,16 @@ DistributedTableCacheEntry(Oid distributedRelationId)
 	else
 	{
 		char *relationName = get_rel_name(distributedRelationId);
-		ereport(ERROR, (errmsg("relation %s is not distributed", relationName)));
+
+		if (relationName == NULL)
+		{
+			ereport(ERROR, (errmsg("relation with OID %u does not exist",
+								   distributedRelationId)));
+		}
+		else
+		{
+			ereport(ERROR, (errmsg("relation %s is not distributed", relationName)));
+		}
 	}
 }