diff --git a/packages/apollo/src/components/Form/Form.js b/packages/apollo/src/components/Form/Form.js
index e43eaa4e..875fd437 100644
--- a/packages/apollo/src/components/Form/Form.js
+++ b/packages/apollo/src/components/Form/Form.js
@@ -418,20 +418,22 @@ class Form extends Component {
 	// 		{name: <field name>, value: <value>}
 	// there are also options that seem to have custom objects, that have a "name" field....
 	fixSelectedItem(data, options) {
-		const value = (typeof data === 'string') ? data : ((data && data.value) ? data.value : data);
-		for (let i in options) {
-			if (typeof options[i] === 'string') {
-				if (options[i] === value) {
-					return options[i];
-				}
-			} else {
-				if (value !== undefined) {
-					if (options[i] && options[i].value === value) {
+		if (data) {
+			const value = (typeof data === 'string') ? data : data.value;
+			for (let i in options) {
+				if (typeof options[i] === 'string') {
+					if (options[i] === value) {
 						return options[i];
 					}
-				} else {			// if there is no "value" field... look for name
-					if (data && data.name && options[i] && options[i].name === data.name) {
-						return options[i];
+				} else {
+					if (value !== undefined) {
+						if (options[i] && options[i].value === value) {
+							return options[i];
+						}
+					} else {			// if there is no "value" field... look for name
+						if (data && data.name && options[i] && options[i].name === data.name) {
+							return options[i];
+						}
 					}
 				}
 			}
diff --git a/packages/athena/public/releaseNotes.json b/packages/athena/public/releaseNotes.json
index bfbecd68..7252e708 100644
--- a/packages/athena/public/releaseNotes.json
+++ b/packages/athena/public/releaseNotes.json
@@ -1,7 +1,7 @@
 [
 	{
-		"version": "1.0.5-26",
-		"date": "21 June 2023",
+		"version": "1.0.5-27",
+		"date": "22 June 2023",
 		"description": [
 			{
 				"title": "Bug & security fixes",