diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
index f4e23df6a..4e3ef335e 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
@@ -114,25 +114,29 @@ export class CreateOrUpdateAccountDialog implements OnDestroy {
       platformId: this.accountForm.controls['platformId'].value?.id ?? null
     };
 
-    if (this.data.account.id) {
-      (account as UpdateAccountDto).id = this.data.account.id;
-
-      await validateObjectForForm({
-        classDto: UpdateAccountDto,
-        form: this.accountForm,
-        object: account
-      });
-    } else {
-      delete (account as CreateAccountDto).id;
+    try {
+      if (this.data.account.id) {
+        (account as UpdateAccountDto).id = this.data.account.id;
+
+        await validateObjectForForm({
+          classDto: UpdateAccountDto,
+          form: this.accountForm,
+          object: account
+        });
+      } else {
+        delete (account as CreateAccountDto).id;
+
+        await validateObjectForForm({
+          classDto: CreateAccountDto,
+          form: this.accountForm,
+          object: account
+        });
+      }
 
-      await validateObjectForForm({
-        classDto: CreateAccountDto,
-        form: this.accountForm,
-        object: account
-      });
+      this.dialogRef.close({ account });
+    } catch (error) {
+      console.error(error);
     }
-
-    this.dialogRef.close({ account });
   }
 
   public ngOnDestroy() {
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
index 881805b44..1196de58c 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@@ -475,28 +475,32 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
       unitPrice: this.activityForm.controls['unitPrice'].value
     };
 
-    if (this.data.activity.id) {
-      (activity as UpdateOrderDto).id = this.data.activity.id;
-
-      await validateObjectForForm({
-        classDto: UpdateOrderDto,
-        form: this.activityForm,
-        ignoreFields: ['dataSource', 'date'],
-        object: activity as UpdateOrderDto
-      });
-    } else {
-      (activity as CreateOrderDto).updateAccountBalance =
-        this.activityForm.controls['updateAccountBalance'].value;
-
-      await validateObjectForForm({
-        classDto: CreateOrderDto,
-        form: this.activityForm,
-        ignoreFields: ['dataSource', 'date'],
-        object: activity
-      });
-    }
+    try {
+      if (this.data.activity.id) {
+        (activity as UpdateOrderDto).id = this.data.activity.id;
+
+        await validateObjectForForm({
+          classDto: UpdateOrderDto,
+          form: this.activityForm,
+          ignoreFields: ['dataSource', 'date'],
+          object: activity as UpdateOrderDto
+        });
+      } else {
+        (activity as CreateOrderDto).updateAccountBalance =
+          this.activityForm.controls['updateAccountBalance'].value;
+
+        await validateObjectForForm({
+          classDto: CreateOrderDto,
+          form: this.activityForm,
+          ignoreFields: ['dataSource', 'date'],
+          object: activity
+        });
+      }
 
-    this.dialogRef.close({ activity });
+      this.dialogRef.close({ activity });
+    } catch (error) {
+      console.error(error);
+    }
   }
 
   public ngOnDestroy() {