diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts
index 1b42eb6b..f587d752 100644
--- a/src/app/shared/components/search-and-select/search-and-select.component.ts
+++ b/src/app/shared/components/search-and-select/search-and-select.component.ts
@@ -75,7 +75,7 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor {
   handleCloseIconClick(event: Event, removedItem): void {
     if (this.selectedData) {
       this.selectedData = this.selectedData.filter(obj => obj.value !== removedItem.value || obj.id !== removedItem.id );
-      this.onChange(this.selectedData)
+      this.onChange(this.selectedData.map(data => data.value))
       event.stopPropagation()
     }
   }
diff --git a/src/app/shared/components/search-popover/search-popover.component.ts b/src/app/shared/components/search-popover/search-popover.component.ts
index c391889b..5ff35301 100644
--- a/src/app/shared/components/search-popover/search-popover.component.ts
+++ b/src/app/shared/components/search-popover/search-popover.component.ts
@@ -127,7 +127,7 @@ export class SearchPopoverComponent implements OnInit {
       return data.result.data
     }
     catch (error) {
-      return null;
+      return error;
     }
   }