diff --git a/packages/esm-patient-clinical-view-app/src/contact-list/contact-list.workspace.tsx b/packages/esm-patient-clinical-view-app/src/contact-list/contact-list.workspace.tsx
index b5f5af7b7..db29e73a7 100644
--- a/packages/esm-patient-clinical-view-app/src/contact-list/contact-list.workspace.tsx
+++ b/packages/esm-patient-clinical-view-app/src/contact-list/contact-list.workspace.tsx
@@ -119,7 +119,14 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
     if (!showIPVRelatedFields) {
       form.setValue('ipvOutCome', undefined);
     }
-  }, [observablePhysicalAssault, observableThreatened, observableSexualAssault, observableRelationship]);
+  }, [
+    observablePhysicalAssault,
+    observableThreatened,
+    observableSexualAssault,
+    observableRelationship,
+    form,
+    showIPVRelatedFields,
+  ]);
 
   return (
     <FormProvider {...form}>
@@ -131,18 +138,21 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
             <Controller
               control={form.control}
               name="startDate"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   id="startDate"
                   datePickerType="single"
                   {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}>
+                  ref={undefined}
+                  invalid={error?.message}
+                  invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={form.formState.errors[field.name]?.message}
-                    invalidText={form.formState.errors[field.name]?.message}
+                    id={`startdate-input`}
+                    name="startdate-input"
+                    invalid={error?.message}
+                    invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('startDate', 'Start Date')}
                     size="xl"
@@ -155,18 +165,18 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
             <Controller
               control={form.control}
               name="endDate"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   id="endDate"
                   datePickerType="single"
                   {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}>
+                  invalid={error?.message}
+                  invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={form.formState.errors[field.name]?.message}
-                    invalidText={form.formState.errors[field.name]?.message}
+                    invalid={error?.message}
+                    invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('endDate', 'End Date')}
                     size="xl"
@@ -179,11 +189,11 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
             <Controller
               control={form.control}
               name="relationshipType"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <Dropdown
                   ref={field.ref}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   id="relationshipToPatient"
                   titleText={t('relationToPatient', 'Relation to patient')}
                   onChange={(e) => {
@@ -203,11 +213,11 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                 <Controller
                   control={form.control}
                   name="livingWithClient"
-                  render={({ field }) => (
+                  render={({ field, fieldState: { error } }) => (
                     <Dropdown
                       ref={field.ref}
-                      invalid={form.formState.errors[field.name]?.message}
-                      invalidText={form.formState.errors[field.name]?.message}
+                      invalid={error?.message}
+                      invalidText={error?.message}
                       id="livingWithClient"
                       titleText={t('livingWithClient', 'Living with client')}
                       onChange={(e) => {
@@ -228,7 +238,7 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                     <Controller
                       control={form.control}
                       name="physicalAssault"
-                      render={({ field }) => (
+                      render={({ field, fieldState: { error } }) => (
                         <RadioButtonGroup
                           id="physicalAssault"
                           legendText={t(
@@ -236,8 +246,8 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                             '1. Has he/she ever hit, kicked, slapped, or otherwise physically hurt you?',
                           )}
                           {...field}
-                          invalid={form.formState.errors[field.name]?.message}
-                          invalidText={form.formState.errors[field.name]?.message}
+                          invalid={error?.message}
+                          invalidText={error?.message}
                           className={styles.billingItem}>
                           <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="physicalAssault_yes" />
                           <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="physicalAssault_no" />
@@ -249,13 +259,13 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                     <Controller
                       control={form.control}
                       name="threatened"
-                      render={({ field }) => (
+                      render={({ field, fieldState: { error } }) => (
                         <RadioButtonGroup
                           id="threatened"
                           legendText={t('threatened', '2. Has he/she ever threatened to hurt you?')}
                           {...field}
-                          invalid={form.formState.errors[field.name]?.message}
-                          invalidText={form.formState.errors[field.name]?.message}
+                          invalid={error?.message}
+                          invalidText={error?.message}
                           className={styles.billingItem}>
                           <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="threatened_yes" />
                           <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="threatened_no" />
@@ -267,7 +277,7 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                     <Controller
                       control={form.control}
                       name="sexualAssault"
-                      render={({ field }) => (
+                      render={({ field, fieldState: { error } }) => (
                         <RadioButtonGroup
                           id="sexualAssault"
                           legendText={t(
@@ -275,8 +285,8 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                             '3.Has he/she ever forced you to do something sexually that made you feel uncomfortable?',
                           )}
                           {...field}
-                          invalid={form.formState.errors[field.name]?.message}
-                          invalidText={form.formState.errors[field.name]?.message}
+                          invalid={error?.message}
+                          invalidText={error?.message}
                           className={styles.billingItem}>
                           <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="sexualAssault_yes" />
                           <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="sexualAssault_no" />
@@ -289,11 +299,11 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                     <Controller
                       control={form.control}
                       name="ipvOutCome"
-                      render={({ field }) => (
+                      render={({ field, fieldState: { error } }) => (
                         <Dropdown
                           ref={field.ref}
-                          invalid={form.formState.errors[field.name]?.message}
-                          invalidText={form.formState.errors[field.name]?.message}
+                          invalid={error?.message}
+                          invalidText={error?.message}
                           id="ipvOutCome"
                           titleText={t('ipvOutCome', 'IPV Outcome')}
                           onChange={(e) => {
@@ -316,11 +326,11 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                 <Controller
                   control={form.control}
                   name="baselineStatus"
-                  render={({ field }) => (
+                  render={({ field, fieldState: { error } }) => (
                     <Dropdown
                       ref={field.ref}
-                      invalid={form.formState.errors[field.name]?.message}
-                      invalidText={form.formState.errors[field.name]?.message}
+                      invalid={error?.message}
+                      invalidText={error?.message}
                       id="baselineStatus"
                       titleText={t('baselineStatus', 'HIV Status')}
                       onChange={(e) => {
@@ -338,11 +348,11 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
                 <Controller
                   control={form.control}
                   name="preferedPNSAproach"
-                  render={({ field }) => (
+                  render={({ field, fieldState: { error } }) => (
                     <Dropdown
                       ref={field.ref}
-                      invalid={form.formState.errors[field.name]?.message}
-                      invalidText={form.formState.errors[field.name]?.message}
+                      invalid={error?.message}
+                      invalidText={error?.message}
                       id="preferedPNSAproach"
                       titleText={t('preferedPNSAproach', 'Prefered PNS Aproach')}
                       onChange={(e) => {
@@ -364,11 +374,7 @@ const ContactListForm: React.FC<ContactListFormProps> = ({
           <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
             {t('discard', 'Discard')}
           </Button>
-          <Button
-            className={styles.button}
-            kind="primary"
-            type="submit"
-            disabled={form.formState.isSubmitting || !form.formState.isValid}>
+          <Button className={styles.button} kind="primary" type="submit" disabled={form.formState.isSubmitting}>
             {t('submit', 'Submit')}
           </Button>
         </ButtonSet>
diff --git a/packages/esm-patient-clinical-view-app/src/family-partner-history/family-relationship.workspace.tsx b/packages/esm-patient-clinical-view-app/src/family-partner-history/family-relationship.workspace.tsx
index 1cad762e2..ef1c32ee2 100644
--- a/packages/esm-patient-clinical-view-app/src/family-partner-history/family-relationship.workspace.tsx
+++ b/packages/esm-patient-clinical-view-app/src/family-partner-history/family-relationship.workspace.tsx
@@ -13,9 +13,6 @@ import styles from './family-relationship.scss';
 import { useMappedRelationshipTypes } from './relationships.resource';
 
 const schema = relationshipFormSchema
-  .extend({
-    notes: z.string().optional(),
-  })
   .refine(
     (data) => {
       return !(data.mode === 'search' && !data.personB);
@@ -58,15 +55,11 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
     resolver: zodResolver(schema),
   });
 
-  const {
-    control,
-    handleSubmit,
-    formState: { isValid },
-  } = form;
+  const { control, handleSubmit } = form;
 
   const onSubmit: SubmitHandler<FormData> = async (data) => {
     try {
-      await saveRelationship(data, config, session, []);
+      await saveRelationship(data, config, session, []); /// Remove notes from payload since endpoint doesn't expect it to avoid 400 error
       closeWorkspace();
     } catch (error) {}
   };
@@ -100,18 +93,19 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
             <Controller
               control={form.control}
               name="startDate"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   id="startDate"
                   datePickerType="single"
                   {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}>
+                  ref={undefined}
+                  invalid={error?.message}
+                  invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={form.formState.errors[field.name]?.message}
-                    invalidText={form.formState.errors[field.name]?.message}
+                    invalid={error?.message}
+                    invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('startDate', 'Start Date')}
                     size="xl"
@@ -124,18 +118,19 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
             <Controller
               control={form.control}
               name="endDate"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   id="endDate"
                   datePickerType="single"
                   {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}>
+                  ref={undefined}
+                  invalid={error?.message}
+                  invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={form.formState.errors[field.name]?.message}
-                    invalidText={form.formState.errors[field.name]?.message}
+                    invalid={error?.message}
+                    invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('endDate', 'End Date')}
                     size="xl"
@@ -144,31 +139,13 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
               )}
             />
           </Column>
-          <Column className={styles.textbox}>
-            <Controller
-              name="notes"
-              control={control}
-              render={({ field }) => (
-                <TextArea
-                  labelText={t('additionalNotes', 'Any additional notes')}
-                  rows={4}
-                  id="relationship-notes"
-                  {...field}
-                />
-              )}
-            />
-          </Column>
         </Stack>
 
         <ButtonSet className={styles.buttonSet}>
           <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
             {t('discard', 'Discard')}
           </Button>
-          <Button
-            className={styles.button}
-            kind="primary"
-            type="submit"
-            disabled={!isValid || form.formState.isLoading}>
+          <Button className={styles.button} kind="primary" type="submit" disabled={form.formState.isSubmitting}>
             {t('save', 'Save')}
           </Button>
         </ButtonSet>
diff --git a/packages/esm-patient-clinical-view-app/src/other-relationships/other-relationships.workspace.tsx b/packages/esm-patient-clinical-view-app/src/other-relationships/other-relationships.workspace.tsx
index 473b3fef4..9050bc3d6 100644
--- a/packages/esm-patient-clinical-view-app/src/other-relationships/other-relationships.workspace.tsx
+++ b/packages/esm-patient-clinical-view-app/src/other-relationships/other-relationships.workspace.tsx
@@ -13,9 +13,6 @@ import { uppercaseText } from '../utils/expression-helper';
 import styles from './other-relationships.scss';
 
 const schema = relationshipFormSchema
-  .extend({
-    notes: z.string().optional(),
-  })
   .refine(
     (data) => {
       return !(data.mode === 'search' && !data.personB);
@@ -57,11 +54,7 @@ export const OtherRelationshipsForm: React.FC<OtherRelationshipsFormProps> = ({
     resolver: zodResolver(schema),
   });
 
-  const {
-    control,
-    handleSubmit,
-    formState: { isValid },
-  } = form;
+  const { control, handleSubmit } = form;
 
   const onSubmit: SubmitHandler<FormData> = async (data) => {
     try {
@@ -87,6 +80,7 @@ export const OtherRelationshipsForm: React.FC<OtherRelationshipsFormProps> = ({
                   id="startDate"
                   datePickerType="single"
                   {...field}
+                  ref={undefined}
                   invalid={form.formState.errors[field.name]?.message}
                   invalidText={form.formState.errors[field.name]?.message}>
                   <DatePickerInput
@@ -111,6 +105,7 @@ export const OtherRelationshipsForm: React.FC<OtherRelationshipsFormProps> = ({
                   id="endDate"
                   datePickerType="single"
                   {...field}
+                  ref={undefined}
                   invalid={form.formState.errors[field.name]?.message}
                   invalidText={form.formState.errors[field.name]?.message}>
                   <DatePickerInput
@@ -142,31 +137,12 @@ export const OtherRelationshipsForm: React.FC<OtherRelationshipsFormProps> = ({
               )}
             />
           </Column>
-
-          <Column className={styles.textbox}>
-            <Controller
-              name="notes"
-              control={control}
-              render={({ field }) => (
-                <TextArea
-                  labelText={t('additionalNotes', 'Any additional notes')}
-                  rows={4}
-                  id="relationship-notes"
-                  {...field}
-                />
-              )}
-            />
-          </Column>
         </Stack>
         <ButtonSet className={styles.buttonSet}>
           <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
             {t('discard', 'Discard')}
           </Button>
-          <Button
-            className={styles.button}
-            kind="primary"
-            type="submit"
-            disabled={!isValid || form.formState.isSubmitting}>
+          <Button className={styles.button} kind="primary" type="submit" disabled={form.formState.isSubmitting}>
             {t('save', 'Save')}
           </Button>
         </ButtonSet>
diff --git a/packages/esm-patient-clinical-view-app/src/relationships/forms/patient-search-create-form.tsx b/packages/esm-patient-clinical-view-app/src/relationships/forms/patient-search-create-form.tsx
index cabda800c..4eadc727f 100644
--- a/packages/esm-patient-clinical-view-app/src/relationships/forms/patient-search-create-form.tsx
+++ b/packages/esm-patient-clinical-view-app/src/relationships/forms/patient-search-create-form.tsx
@@ -77,13 +77,13 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
           <Controller
             control={form.control}
             name="personB"
-            render={({ field }) => (
+            render={({ field, fieldState: { error } }) => (
               <Autosuggest
                 className={styles.input}
                 labelText={t('patient', 'Patient')}
                 placeholder={t('patientPlaceHolder', 'Search patient')}
-                invalid={Boolean(form.formState.errors[field.name]?.message)}
-                invalidText={form.formState.errors[field.name]?.message}
+                invalid={Boolean(error?.message)}
+                invalidText={error?.message}
                 getDisplayValue={(item) => item.person.display}
                 renderSuggestionItem={(item) => <PatientSearchInfo patient={item} />}
                 getFieldValue={(item) => item.uuid}
@@ -113,10 +113,10 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.givenName"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <TextInput
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   {...field}
                   placeholder="First name"
                   labelText={t('firstName', 'First name')}
@@ -128,10 +128,10 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.middleName"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <TextInput
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   {...field}
                   placeholder="Middle name"
                   labelText={t('middleName', 'Middle name')}
@@ -143,10 +143,10 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.familyName"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <TextInput
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   {...field}
                   placeholder="Last name"
                   labelText={t('lastName', 'Last name')}
@@ -158,16 +158,18 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.gender"
-              render={({ field }) => (
-                <RadioButtonGroup
-                  legendText={t('sex', 'Sex')}
-                  {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
-                  className={styles.billingItem}>
-                  <RadioButton labelText={t('male', 'Male')} value="M" id="M" />
-                  <RadioButton labelText={t('female', 'Female')} value="F" id="F" />
-                </RadioButtonGroup>
+              render={({ field, fieldState: { error } }) => (
+                <>
+                  <RadioButtonGroup
+                    name="personBInfo.gender"
+                    legendText={t('sex', 'Sex')}
+                    {...field}
+                    invalid={error?.message}
+                    invalidText={error?.message}>
+                    <RadioButton labelText={t('male', 'Male')} value="M" id="M" />
+                    <RadioButton labelText={t('female', 'Female')} value="F" id="F" />
+                  </RadioButtonGroup>
+                </>
               )}
             />
           </Column>
@@ -175,11 +177,16 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.birthdate"
-              render={({ field }) => (
-                <DatePicker datePickerType="single" {...field} className={styles.datePickerInput}>
+              render={({ field, fieldState: { error } }) => (
+                <DatePicker
+                  datePickerType="single"
+                  {...field}
+                  invalid={error?.message}
+                  invalidText={error?.message}
+                  className={styles.datePickerInput}>
                   <DatePickerInput
-                    invalid={form.formState.errors[field.name]?.message}
-                    invalidText={form.formState.errors[field.name]?.message}
+                    invalid={error?.message}
+                    invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('dateOfBirth', 'Date of birth')}
                     size="xl"
@@ -195,11 +202,11 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.maritalStatus"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <Dropdown
                   ref={field.ref}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   id="maritalStatus"
                   titleText={t('maritalStatus', 'Marital status')}
                   onChange={(e) => {
@@ -218,10 +225,10 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.address"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <TextInput
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   {...field}
                   placeholder="Physical Address/Landmark"
                   labelText={t('address', 'Address')}
@@ -233,11 +240,11 @@ const PatientSearchCreate: React.FC<PatientSearchCreateProps> = () => {
             <Controller
               control={form.control}
               name="personBInfo.phoneNumber"
-              render={({ field }) => (
+              render={({ field, fieldState: { error } }) => (
                 <TextInput
                   {...field}
-                  invalid={form.formState.errors[field.name]?.message}
-                  invalidText={form.formState.errors[field.name]?.message}
+                  invalid={error?.message}
+                  invalidText={error?.message}
                   placeholder="Phone number"
                   labelText={t('phoneNumber', 'Phone number')}
                 />
diff --git a/packages/esm-patient-clinical-view-app/src/relationships/relationship.resources.ts b/packages/esm-patient-clinical-view-app/src/relationships/relationship.resources.ts
index 49c481662..66ebcb8de 100644
--- a/packages/esm-patient-clinical-view-app/src/relationships/relationship.resources.ts
+++ b/packages/esm-patient-clinical-view-app/src/relationships/relationship.resources.ts
@@ -74,9 +74,9 @@ export const relationshipFormSchema = z.object({
   mode: z.enum(['create', 'search']).default('search'),
   personBInfo: z
     .object({
-      givenName: z.string().min(1, 'Required'),
-      middleName: z.string().min(1, 'Required'),
-      familyName: z.string().min(1, 'Required'),
+      givenName: z.string().min(1, 'Given name required'),
+      middleName: z.string().optional(),
+      familyName: z.string().min(1, 'Family name required'),
       gender: z.enum(['M', 'F']),
       birthdate: z.date({ coerce: true }).max(new Date(), 'Must not be a future date'),
       maritalStatus: z.string().optional(),
@@ -146,7 +146,7 @@ export const saveRelationship = async (
       patient = response.data?.uuid;
       showSnackbar({ title: 'Success', kind: 'success', subtitle: 'Patient created succesfully' });
     } catch (error) {
-      showSnackbar({ title: 'Failure', kind: 'error', subtitle: 'Error creating patient' });
+      showSnackbar({ title: 'Error creating patient', kind: 'error', subtitle: error?.message });
       throw error; // Don't contunue if an erro ocuures
     }
   }
@@ -197,7 +197,7 @@ export const saveRelationship = async (
       });
       showSnackbar({ title: 'Success', kind: 'success', subtitle: 'Patient Demographics saved succesfuly' });
     } catch (error) {
-      showSnackbar({ title: 'Failure', kind: 'error', subtitle: 'Error saving patient demographics' });
+      showSnackbar({ title: 'Error saving patient demographics', kind: 'error', subtitle: error?.message });
     }
   }
 
@@ -216,7 +216,7 @@ export const saveRelationship = async (
     showSnackbar({ title: 'Success', kind: 'success', subtitle: 'Relationship saved succesfully' });
     mutate((key) => typeof key === 'string' && key.startsWith('/ws/rest/v1/relationship'));
   } catch (error) {
-    showSnackbar({ title: 'Failure', kind: 'error', subtitle: 'Error saving relationship' });
+    showSnackbar({ title: 'Error saving relationship', kind: 'error', subtitle: error?.message });
     throw error;
   }
 };