From b1c82626d98b1185a4b7d1a49b1769231f6993d2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 1 Feb 2021 13:23:18 +0000
Subject: [PATCH] Improve validation around loading options for relationship
 field

---
 .../src/forms/RelationshipField.svelte                    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/standard-components/src/forms/RelationshipField.svelte b/packages/standard-components/src/forms/RelationshipField.svelte
index f015954575..84842a02c3 100644
--- a/packages/standard-components/src/forms/RelationshipField.svelte
+++ b/packages/standard-components/src/forms/RelationshipField.svelte
@@ -25,13 +25,17 @@
 
   const fetchTable = async id => {
     if (id != null) {
-      tableDefinition = await API.fetchTableDefinition(id)
+      const result = await API.fetchTableDefinition(id)
+      if (!result.error) {
+        tableDefinition = result
+      }
     }
   }
 
   const fetchRows = async id => {
     if (id != null) {
-      options = await API.fetchTableData(id)
+      const rows = await API.fetchTableData(id)
+      options = rows && !rows.error ? rows : []
     }
   }