diff --git a/src/lib/components/multiSelectTable.svelte b/src/lib/components/multiSelectTable.svelte
index 8479f72a7..190cbfab8 100644
--- a/src/lib/components/multiSelectTable.svelte
+++ b/src/lib/components/multiSelectTable.svelte
@@ -1,6 +1,5 @@
 <script lang="ts" module>
-    // TODO: @itznotabug - true | string | Error | void
-    export type DeleteOperationState = true | string | void;
+    export type DeleteOperationState = Error | void;
 </script>
 
 <script lang="ts">
@@ -106,7 +105,7 @@
                             showConfirmDeletion = true;
                         } else {
                             const state = await onDelete?.(selectedRows);
-                            if (typeof state === 'string') {
+                            if (state instanceof Error) {
                                 // user should handle error on their own!
                             } else {
                                 notifySuccess();
@@ -131,9 +130,9 @@
                 onDeleteError = null;
 
                 const state = await onDelete?.(selectedRows);
-                if (typeof state === 'string') {
+                if (state instanceof Error) {
                     disableModal = false;
-                    onDeleteError = state || `Failed to delete ${resource}s`;
+                    onDeleteError = state.message || `Failed to delete ${resource}s`;
                 } else {
                     notifySuccess();
                     selectedRows = [];
diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
index 1423a9ed3..68344d237 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
@@ -67,12 +67,10 @@
 
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.UserDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.UserDelete);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.USERS);
         }
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
index 05a321591..853d8515f 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
@@ -51,12 +51,10 @@
 
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.TeamDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.TeamDelete);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.TEAMS);
         }
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
index 653a2cad2..98999a305 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
@@ -39,13 +39,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.MEMBERSHIPS);
-
             trackEvent(Submit.MembershipUpdate, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MembershipUpdate);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.MEMBERSHIPS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
index 66dbd6893..5d9e956af 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
@@ -30,13 +30,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.USER_IDENTITIES);
-
             trackEvent(Submit.UserIdentityDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.UserIdentityDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.USER_IDENTITIES);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
index a78be3f4f..6dd989a88 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
@@ -39,12 +39,10 @@
 
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.MembershipUpdate, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MembershipUpdate);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.MEMBERSHIPS);
         }
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
index f06ed2ab4..e71859a43 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
@@ -28,13 +28,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.USER_TARGETS);
-
             trackEvent(Submit.UserTargetDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.UserTargetDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.USER_TARGETS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
index f9f5b7d0e..fc1fcca7e 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
@@ -116,7 +116,6 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.BACKUPS);
 
             if (selectedBackup) {
                 addNotification({
@@ -131,13 +130,15 @@
                     message: error.message
                 });
             } else {
-                return error.message;
+                return error;
             }
         } finally {
             if (selectedBackup) {
                 showDelete = false;
                 selectedBackup = null;
             }
+
+            await invalidate(Dependencies.BACKUPS);
         }
     }
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
index 473cc08a3..958aadec3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
@@ -26,14 +26,13 @@
         );
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.TABLES);
-            subNavigation.update();
-
             trackEvent(Submit.TableDelete);
-            return true;
         } catch (error) {
             trackError(error, Submit.TableDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.TABLES);
+            subNavigation.update();
         }
     }
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
index 5205f9f20..4d5c2d06f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
@@ -39,13 +39,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.EXECUTIONS);
-
             trackEvent(Submit.ExecutionDelete);
-            return true;
         } catch (error) {
             trackError(error, Submit.ExecutionDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.EXECUTIONS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
index 65e10e1f3..c4c1d1743 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
@@ -59,13 +59,12 @@
         );
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.DEPLOYMENTS);
-
             trackEvent(Submit.DeploymentDelete);
-            return true;
         } catch (error) {
             trackError(error, Submit.DeploymentDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.DEPLOYMENTS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
index 2e02d5e50..6d1faed8c 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
@@ -109,13 +109,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.MESSAGING_MESSAGES);
-
             trackEvent(Submit.MessagingMessageDelete, { total: selected.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MessagingMessageDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.MESSAGING_MESSAGES);
         }
     }
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
index 5f2a0ddf8..a54178b3d 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
@@ -29,13 +29,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.MESSAGING_PROVIDERS);
-
             trackEvent(Submit.MessagingProviderDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MessagingProviderDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.MESSAGING_PROVIDERS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
index 4dde3847e..f5525754e 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
@@ -29,12 +29,10 @@
 
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.MessagingTopicDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MessagingTopicDelete);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.MESSAGING_TOPICS);
         }
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
index c062b6dce..c9a64e9af 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
@@ -50,12 +50,10 @@
 
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.MessagingTopicSubscriberDelete, { total: selectedRows.length });
-            return true;
         } catch (error) {
             trackError(error, Submit.MessagingTopicSubscriberDelete);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
         }
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
index 771ca9967..7403cf07d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
@@ -45,12 +45,10 @@
         );
         try {
             await Promise.all(promises);
-
             trackEvent(Submit.DeploymentDelete);
-            return true;
         } catch (error) {
             trackError(error, Submit.DeploymentDelete);
-            return error.message;
+            return error;
         } finally {
             await Promise.all([
                 invalidate(Dependencies.DEPLOYMENTS),
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte
index 816d7c03f..24c6f957e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/table.svelte
@@ -37,13 +37,12 @@
 
         try {
             await Promise.all(promises);
-            await invalidate(Dependencies.EXECUTIONS);
-
             trackEvent(Submit.LogDelete);
-            return true;
         } catch (error) {
             trackError(error, Submit.LogDelete);
-            return error.message;
+            return error;
+        } finally {
+            await invalidate(Dependencies.EXECUTIONS);
         }
     }
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
index d3a08759b..8caf3c05a 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
@@ -78,7 +78,7 @@
             trackEvent(Submit.FileDelete, { total: selectedRows.length });
         } catch (error) {
             trackError(error, Submit.FileDelete);
-            return error.message;
+            return error;
         } finally {
             await invalidate(Dependencies.FILES);
         }