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)));
+		}
 	}
 }