diff --git a/app/Actions/CoolifyTask/RunRemoteProcess.php b/app/Actions/CoolifyTask/RunRemoteProcess.php
index 192144f8b..1444684a0 100644
--- a/app/Actions/CoolifyTask/RunRemoteProcess.php
+++ b/app/Actions/CoolifyTask/RunRemoteProcess.php
@@ -97,7 +97,6 @@ public function __invoke(): ProcessResult
             'status' => $status->value,
         ]);
         $this->activity->save();
-
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
             throw new \RuntimeException($processResult->errorOutput());
         }
diff --git a/app/Actions/License/CheckResaleLicense.php b/app/Actions/License/CheckResaleLicense.php
index 54f97c834..8dd456ccd 100644
--- a/app/Actions/License/CheckResaleLicense.php
+++ b/app/Actions/License/CheckResaleLicense.php
@@ -57,13 +57,13 @@ public function __invoke()
                 throw new \Exception('Invalid license key.');
             }
             throw new \Exception('Cannot activate license key.');
-        } catch (\Throwable $th) {
-            ray($th);
+        } catch (\Throwable $e) {
+            ray($e);
             $settings->update([
                 'resale_license' => null,
                 'is_resale_license_active' => false,
             ]);
-            throw $th;
+            throw $e;
         }
     }
 }
diff --git a/app/Actions/Proxy/SaveConfigurationSync.php b/app/Actions/Proxy/SaveConfigurationSync.php
index b35b4375b..8be3ca9db 100644
--- a/app/Actions/Proxy/SaveConfigurationSync.php
+++ b/app/Actions/Proxy/SaveConfigurationSync.php
@@ -20,8 +20,8 @@ public function __invoke(Server $server, string $configuration)
                 "mkdir -p $proxy_path",
                 "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
             ], $server);
-        } catch (\Throwable $th) {
-            ray($th);
+        } catch (\Throwable $e) {
+            ray($e);
         }
 
     }
diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php
index de4700b75..bdf8275c7 100644
--- a/app/Actions/Server/UpdateCoolify.php
+++ b/app/Actions/Server/UpdateCoolify.php
@@ -43,11 +43,11 @@ public function __invoke(bool $force)
                 $this->update();
             }
             send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
-        } catch (\Exception $th) {
+        } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
-            ray($th->getMessage());
-            send_internal_notification('InstanceAutoUpdateJob failed: ' . $th->getMessage());
-            throw $th;
+            ray($e->getMessage());
+            send_internal_notification('InstanceAutoUpdateJob failed: ' . $e->getMessage());
+            throw $e;
         }
     }
 
diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index ae682e682..446b0c693 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -26,7 +26,7 @@ private function cleanup_in_progress_application_deployments()
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }
diff --git a/app/Console/Commands/SyncBunny.php b/app/Console/Commands/SyncBunny.php
index 3f4bc412a..4a9945ece 100644
--- a/app/Console/Commands/SyncBunny.php
+++ b/app/Console/Commands/SyncBunny.php
@@ -82,7 +82,7 @@ public function handle()
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
             ]);
             echo "All files uploaded & purged...\n";
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo $e->getMessage();
         }
     }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d8cf0c9cf..17db86d13 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -25,7 +25,7 @@ class Handler extends ExceptionHandler
      * @var array<int, class-string<\Throwable>>
      */
     protected $dontReport = [
-        //
+        ProcessException::class
     ];
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
diff --git a/app/Exceptions/ProcessException.php b/app/Exceptions/ProcessException.php
new file mode 100644
index 000000000..68dbb53b2
--- /dev/null
+++ b/app/Exceptions/ProcessException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ProcessException extends Exception
+{
+
+}
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 29d705faf..913879c6b 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -154,8 +154,8 @@ public function acceptInvitation()
                 $invitation->delete();
                 abort(401);
             }
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (Throwable $e) {
+            throw $e;
         }
     }
 
@@ -172,8 +172,8 @@ public function revokeInvitation()
             }
             $invitation->delete();
             return redirect()->route('team.index');
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (Throwable $e) {
+            throw $e;
         }
     }
 }
diff --git a/app/Http/Livewire/Boarding/Index.php b/app/Http/Livewire/Boarding/Index.php
index 44b45dee7..2cb3b1049 100644
--- a/app/Http/Livewire/Boarding/Index.php
+++ b/app/Http/Livewire/Boarding/Index.php
@@ -193,7 +193,7 @@ public function validateServer() {
             }
             $this->getProxyType();
 
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
         }
     }
diff --git a/app/Http/Livewire/CheckLicense.php b/app/Http/Livewire/CheckLicense.php
index 3afefed34..3c5d1b8f2 100644
--- a/app/Http/Livewire/CheckLicense.php
+++ b/app/Http/Livewire/CheckLicense.php
@@ -34,9 +34,9 @@ public function submit()
             try {
                 resolve(CheckResaleLicense::class)();
                 $this->emit('reloadWindow');
-            } catch (\Throwable $th) {
-                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $th->getMessage());
-                ray($th->getMessage());
+            } catch (\Throwable $e) {
+                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
+                ray($e->getMessage());
                 return redirect()->to('/settings/license');
             }
         }
diff --git a/app/Http/Livewire/Destination/Form.php b/app/Http/Livewire/Destination/Form.php
index 56c7ba5ed..9bfb8cf74 100644
--- a/app/Http/Livewire/Destination/Form.php
+++ b/app/Http/Livewire/Destination/Form.php
@@ -37,7 +37,7 @@ public function delete()
             }
             $this->destination->delete();
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
diff --git a/app/Http/Livewire/Destination/New/StandaloneDocker.php b/app/Http/Livewire/Destination/New/StandaloneDocker.php
index 1af7bc2df..519b1e700 100644
--- a/app/Http/Livewire/Destination/New/StandaloneDocker.php
+++ b/app/Http/Livewire/Destination/New/StandaloneDocker.php
@@ -71,7 +71,7 @@ public function submit()
             }
             $this->createNetworkAndAttachToProxy();
             return redirect()->route('destination.show', $docker->uuid);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/ForcePasswordReset.php b/app/Http/Livewire/ForcePasswordReset.php
index df2b37691..732859280 100644
--- a/app/Http/Livewire/ForcePasswordReset.php
+++ b/app/Http/Livewire/ForcePasswordReset.php
@@ -36,7 +36,7 @@ public function submit()
                 send_internal_notification('First login for ' . auth()->user()->email);
             }
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Help.php b/app/Http/Livewire/Help.php
index 107821501..9f3ca434f 100644
--- a/app/Http/Livewire/Help.php
+++ b/app/Http/Livewire/Help.php
@@ -43,7 +43,7 @@ public function submit()
             $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
             send_user_an_email($mail, 'hi@coollabs.io');
             $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
diff --git a/app/Http/Livewire/Notifications/DiscordSettings.php b/app/Http/Livewire/Notifications/DiscordSettings.php
index cd7a413a5..97a8878f1 100644
--- a/app/Http/Livewire/Notifications/DiscordSettings.php
+++ b/app/Http/Livewire/Notifications/DiscordSettings.php
@@ -29,7 +29,7 @@ public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
             $this->team->discord_enabled = false;
             $this->validate();
diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php
index 4ef735a04..939b8bce0 100644
--- a/app/Http/Livewire/Notifications/EmailSettings.php
+++ b/app/Http/Livewire/Notifications/EmailSettings.php
@@ -63,7 +63,7 @@ public function submitFromFields()
             ]);
             $this->team->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -82,7 +82,7 @@ public function instantSaveInstance()
             $this->team->resend_enabled = false;
             $this->team->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -92,7 +92,7 @@ public function instantSaveResend()
         try {
             $this->team->smtp_enabled = false;
             $this->submitResend();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return general_error_handler($e, $this);
         }
@@ -102,7 +102,7 @@ public function instantSave()
         try {
             $this->team->resend_enabled = false;
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return general_error_handler($e, $this);
         }
@@ -131,7 +131,7 @@ public function submit()
             ]);
             $this->team->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->smtp_enabled = false;
             return general_error_handler($e, $this);
         }
@@ -146,7 +146,7 @@ public function submitResend()
             $this->team->save();
             refreshSession();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->team->resend_enabled = false;
             return general_error_handler($e, $this);
         }
diff --git a/app/Http/Livewire/Notifications/TelegramSettings.php b/app/Http/Livewire/Notifications/TelegramSettings.php
index d6c6c8395..15dca1490 100644
--- a/app/Http/Livewire/Notifications/TelegramSettings.php
+++ b/app/Http/Livewire/Notifications/TelegramSettings.php
@@ -35,7 +35,7 @@ public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
             $this->team->telegram_enabled = false;
             $this->validate();
diff --git a/app/Http/Livewire/PrivateKey/Change.php b/app/Http/Livewire/PrivateKey/Change.php
index 6c849b0a9..a85bac8d2 100644
--- a/app/Http/Livewire/PrivateKey/Change.php
+++ b/app/Http/Livewire/PrivateKey/Change.php
@@ -38,7 +38,7 @@ public function delete()
                 return redirect()->route('security.private-key.index');
             }
             $this->emit('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
@@ -49,7 +49,7 @@ public function changePrivateKey()
             $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
             $this->private_key->save();
             refresh_server_connection($this->private_key);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/PrivateKey/Create.php b/app/Http/Livewire/PrivateKey/Create.php
index eac749399..37363195d 100644
--- a/app/Http/Livewire/PrivateKey/Create.php
+++ b/app/Http/Livewire/PrivateKey/Create.php
@@ -38,7 +38,7 @@ public function createPrivateKey()
                 return redirect()->route('server.create');
             }
             return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/AddEmpty.php b/app/Http/Livewire/Project/AddEmpty.php
index fc20f9850..8d2399a47 100644
--- a/app/Http/Livewire/Project/AddEmpty.php
+++ b/app/Http/Livewire/Project/AddEmpty.php
@@ -28,7 +28,7 @@ public function submit()
                 'team_id' => currentTeam()->id,
             ]);
             return redirect()->route('project.show', $project->uuid);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->name = '';
diff --git a/app/Http/Livewire/Project/AddEnvironment.php b/app/Http/Livewire/Project/AddEnvironment.php
index ea38df073..fc0ac61c6 100644
--- a/app/Http/Livewire/Project/AddEnvironment.php
+++ b/app/Http/Livewire/Project/AddEnvironment.php
@@ -31,7 +31,7 @@ public function submit()
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->name = '';
diff --git a/app/Http/Livewire/Project/Application/General.php b/app/Http/Livewire/Project/Application/General.php
index 13d73c36e..0f68a8a2c 100644
--- a/app/Http/Livewire/Project/Application/General.php
+++ b/app/Http/Livewire/Project/Application/General.php
@@ -161,7 +161,7 @@ public function submit()
             }
             $this->application->save();
             $this->emit('success', 'Application settings updated!');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/Database/BackupEdit.php b/app/Http/Livewire/Project/Database/BackupEdit.php
index 39b29c83f..a8a0ef055 100644
--- a/app/Http/Livewire/Project/Database/BackupEdit.php
+++ b/app/Http/Livewire/Project/Database/BackupEdit.php
@@ -51,7 +51,7 @@ public function instantSave()
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }
@@ -76,7 +76,7 @@ public function submit()
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }
diff --git a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
index 9297f65f6..d9887efbf 100644
--- a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
+++ b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
@@ -42,7 +42,7 @@ public function submit(): void
                 'team_id' => currentTeam()->id,
             ]);
             $this->emit('refreshScheduledBackups');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->frequency = '';
diff --git a/app/Http/Livewire/Project/Edit.php b/app/Http/Livewire/Project/Edit.php
index 60702ca3e..9d5342b5a 100644
--- a/app/Http/Livewire/Project/Edit.php
+++ b/app/Http/Livewire/Project/Edit.php
@@ -19,7 +19,7 @@ public function submit()
         try {
             $this->project->save();
             $this->emit('saved');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
diff --git a/app/Http/Livewire/Project/New/GithubPrivateRepository.php b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
index dec4e80e8..cf371404a 100644
--- a/app/Http/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
@@ -164,7 +164,7 @@ public function submit()
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php b/app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
index d18fe2541..21fa87e42 100644
--- a/app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
+++ b/app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
@@ -117,7 +117,7 @@ public function submit()
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php
index eb36cb1f1..105a56167 100644
--- a/app/Http/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Http/Livewire/Project/New/PublicGitRepository.php
@@ -75,14 +75,14 @@ public function load_branch()
         $this->get_git_source();
         $this->get_branch();
         $this->selected_branch = $this->git_branch;
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
         if (!$this->branch_found && $this->git_branch == 'main') {
             try {
                 $this->git_branch = 'master';
                 $this->get_branch();
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 return general_error_handler(err: $e, that: $this);
             }
         }
@@ -161,7 +161,7 @@ public function submit()
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/New/Select.php b/app/Http/Livewire/Project/New/Select.php
index 0ea7fd8c1..9a64a0e31 100644
--- a/app/Http/Livewire/Project/New/Select.php
+++ b/app/Http/Livewire/Project/New/Select.php
@@ -40,7 +40,7 @@ public function mount()
     //     try {
     //         instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
     //         $this->emit('success', 'Successfully connected to the database.');
-    //     } catch (\Exception $e) {
+    //     } catch (\Throwable $e) {
     //         return general_error_handler($e, $this);
     //     }
     // }
diff --git a/app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php
index 899060085..d88a71a1b 100644
--- a/app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -108,7 +108,7 @@ public function submit($data)
             $environment->save();
             $this->refreshEnvs();
             $this->emit('success', 'Environment variable added successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/Shared/ResourceLimits.php b/app/Http/Livewire/Project/Shared/ResourceLimits.php
index 6b4ae7e3a..edf6702c6 100644
--- a/app/Http/Livewire/Project/Shared/ResourceLimits.php
+++ b/app/Http/Livewire/Project/Shared/ResourceLimits.php
@@ -53,7 +53,7 @@ public function submit()
             $this->validate();
             $this->resource->save();
             $this->emit('success', 'Resource limits updated successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Project/Shared/Storages/All.php b/app/Http/Livewire/Project/Shared/Storages/All.php
index ee016143b..db9dd19f5 100644
--- a/app/Http/Livewire/Project/Shared/Storages/All.php
+++ b/app/Http/Livewire/Project/Shared/Storages/All.php
@@ -28,7 +28,7 @@ public function submit($data)
             $this->resource->refresh();
             $this->emit('success', 'Storage added successfully');
             $this->emit('clearAddStorage');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/RunCommand.php b/app/Http/Livewire/RunCommand.php
index 747ce9568..2f0edc9da 100755
--- a/app/Http/Livewire/RunCommand.php
+++ b/app/Http/Livewire/RunCommand.php
@@ -32,7 +32,7 @@ public function runCommand()
         try {
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
             $this->emit('newMonitorActivity', $activity->id);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php
index b3346fa23..53cf8234d 100644
--- a/app/Http/Livewire/Server/Form.php
+++ b/app/Http/Livewire/Server/Form.php
@@ -66,7 +66,7 @@ public function validateServer()
             } else {
                 $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, that: $this);
         }
     }
@@ -81,7 +81,7 @@ public function delete()
             }
             $this->server->delete();
             return redirect()->route('server.all');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php
index 7b3297995..d0b44ecaf 100644
--- a/app/Http/Livewire/Server/New/ByIp.php
+++ b/app/Http/Livewire/Server/New/ByIp.php
@@ -78,7 +78,7 @@ public function submit()
             $server->settings->is_part_of_swarm = $this->is_part_of_swarm;
             $server->settings->save();
             return redirect()->route('server.show', $server->uuid);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
diff --git a/app/Http/Livewire/Server/Proxy.php b/app/Http/Livewire/Server/Proxy.php
index 2e8530e1c..c11476d65 100644
--- a/app/Http/Livewire/Server/Proxy.php
+++ b/app/Http/Livewire/Server/Proxy.php
@@ -55,7 +55,7 @@ public function submit()
 
             setup_default_redirect_404(redirect_url: $this->server->proxy->redirect_url, server: $this->server);
             $this->emit('success', 'Proxy configuration saved.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
@@ -64,7 +64,7 @@ public function reset_proxy_configuration()
     {
         try {
             $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
@@ -73,7 +73,7 @@ public function load_proxy_configuration()
     {
         try {
             $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
diff --git a/app/Http/Livewire/Server/ShowPrivateKey.php b/app/Http/Livewire/Server/ShowPrivateKey.php
index 993afde00..cfb1cdd67 100644
--- a/app/Http/Livewire/Server/ShowPrivateKey.php
+++ b/app/Http/Livewire/Server/ShowPrivateKey.php
@@ -21,7 +21,7 @@ public function setPrivateKey($newPrivateKeyId)
             $this->server->refresh();
             refresh_server_connection($this->server->privateKey);
             $this->checkConnection();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->server->update([
                 'private_key_id' => $oldPrivateKeyId
             ]);
@@ -46,7 +46,7 @@ public function checkConnection()
             } else {
                 $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new \Exception($e->getMessage());
         }
     }
diff --git a/app/Http/Livewire/Settings/Email.php b/app/Http/Livewire/Settings/Email.php
index 878b1133f..f03fccc46 100644
--- a/app/Http/Livewire/Settings/Email.php
+++ b/app/Http/Livewire/Settings/Email.php
@@ -50,7 +50,7 @@ public function submitFromFields() {
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -62,7 +62,7 @@ public function submitResend() {
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->settings->resend_enabled = false;
             return general_error_handler($e, $this);
         }
@@ -71,7 +71,7 @@ public function instantSaveResend() {
         try {
             $this->settings->smtp_enabled = false;
             $this->submitResend();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -80,7 +80,7 @@ public function instantSave()
         try {
             $this->settings->resend_enabled = false;
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -99,7 +99,7 @@ public function submit()
             ]);
             $this->settings->save();
             $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
diff --git a/app/Http/Livewire/Source/Github/Change.php b/app/Http/Livewire/Source/Github/Change.php
index 32f84e8ed..41ce367d9 100644
--- a/app/Http/Livewire/Source/Github/Change.php
+++ b/app/Http/Livewire/Source/Github/Change.php
@@ -51,7 +51,7 @@ public function submit()
         try {
             $this->validate();
             $this->github_app->save();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
@@ -65,7 +65,7 @@ public function delete()
         try {
             $this->github_app->delete();
             redirect()->route('source.all');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Source/Github/Create.php b/app/Http/Livewire/Source/Github/Create.php
index c607af451..83e6e2988 100644
--- a/app/Http/Livewire/Source/Github/Create.php
+++ b/app/Http/Livewire/Source/Github/Create.php
@@ -49,7 +49,7 @@ public function createGitHubApp()
                 session(['from' => session('from') + ['source_id' => $github_app->id]]);
             }
             redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Subscription/Actions.php b/app/Http/Livewire/Subscription/Actions.php
index 7de0ec728..1ed3ca378 100644
--- a/app/Http/Livewire/Subscription/Actions.php
+++ b/app/Http/Livewire/Subscription/Actions.php
@@ -30,7 +30,7 @@ public function cancel()
                 $this->emit('success', 'Subscription cancelled successfully. Reloading in 5s.');
                 $this->emit('reloadWindow', 5000);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
@@ -65,7 +65,7 @@ public function resume()
                 $this->emit('success', 'Subscription resumed successfully. Reloading in 5s.');
                 $this->emit('reloadWindow', 5000);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }
diff --git a/app/Http/Livewire/Team/Create.php b/app/Http/Livewire/Team/Create.php
index 0e721814c..d5b80e53b 100644
--- a/app/Http/Livewire/Team/Create.php
+++ b/app/Http/Livewire/Team/Create.php
@@ -31,8 +31,8 @@ public function submit()
             auth()->user()->teams()->attach($team, ['role' => 'admin']);
             refreshSession();
             return redirect()->route('team.index');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }
diff --git a/app/Http/Livewire/Team/Form.php b/app/Http/Livewire/Team/Form.php
index 16aff27ee..212957e44 100644
--- a/app/Http/Livewire/Team/Form.php
+++ b/app/Http/Livewire/Team/Form.php
@@ -28,8 +28,8 @@ public function submit()
         try {
             $this->team->save();
             refreshSession();
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }
diff --git a/app/Http/Livewire/Team/Storage/Create.php b/app/Http/Livewire/Team/Storage/Create.php
index e1330784a..28e6f63c7 100644
--- a/app/Http/Livewire/Team/Storage/Create.php
+++ b/app/Http/Livewire/Team/Storage/Create.php
@@ -67,8 +67,8 @@ public function submit()
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             return redirect()->route('team.storages.show', $this->storage->uuid);
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -77,8 +77,8 @@ private function test_s3_connection()
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }
diff --git a/app/Http/Livewire/Team/Storage/Form.php b/app/Http/Livewire/Team/Storage/Form.php
index 3bdbbc508..1572c45ac 100644
--- a/app/Http/Livewire/Team/Storage/Form.php
+++ b/app/Http/Livewire/Team/Storage/Form.php
@@ -32,8 +32,8 @@ public function test_s3_connection()
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -42,8 +42,8 @@ public function delete()
         try {
             $this->storage->delete();
             return redirect()->route('team.storages.all');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -55,8 +55,8 @@ public function submit()
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             $this->emit('success', 'Storage settings saved.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }
diff --git a/app/Http/Livewire/Upgrade.php b/app/Http/Livewire/Upgrade.php
index e79c73fb7..69300b0eb 100644
--- a/app/Http/Livewire/Upgrade.php
+++ b/app/Http/Livewire/Upgrade.php
@@ -37,7 +37,7 @@ public function upgrade()
             $this->showProgress = true;
             resolve(UpdateCoolify::class)(true);
             Toaster::success("Upgrading to {$this->latestVersion} version...");
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Http/Livewire/Waitlist/Index.php b/app/Http/Livewire/Waitlist/Index.php
index 72d16b682..fb040c6d5 100644
--- a/app/Http/Livewire/Waitlist/Index.php
+++ b/app/Http/Livewire/Waitlist/Index.php
@@ -52,7 +52,7 @@ public function submit()
 
             $this->emit('success', 'Check your email to verify your email address.');
             dispatch(new SendConfirmationForWaitlistJob($this->email, $waitlist->uuid));
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
diff --git a/app/Jobs/ApplicationContainerStatusJob.php b/app/Jobs/ApplicationContainerStatusJob.php
index f7496770d..67e629425 100644
--- a/app/Jobs/ApplicationContainerStatusJob.php
+++ b/app/Jobs/ApplicationContainerStatusJob.php
@@ -46,9 +46,9 @@ public function handle(): void
                 $this->application->status = $status;
                 $this->application->save();
             }
-        } catch (\Exception $th) {
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/ApplicationPullRequestUpdateJob.php b/app/Jobs/ApplicationPullRequestUpdateJob.php
index f54063183..19fbcd7e7 100755
--- a/app/Jobs/ApplicationPullRequestUpdateJob.php
+++ b/app/Jobs/ApplicationPullRequestUpdateJob.php
@@ -57,7 +57,7 @@ public function handle()
             } else {
                 $this->create_comment();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e);
             throw $e;
         }
diff --git a/app/Jobs/CheckResaleLicenseJob.php b/app/Jobs/CheckResaleLicenseJob.php
index 30f9ff198..fe4eed27f 100644
--- a/app/Jobs/CheckResaleLicenseJob.php
+++ b/app/Jobs/CheckResaleLicenseJob.php
@@ -21,10 +21,10 @@ public function handle(): void
     {
         try {
             resolve(CheckResaleLicense::class)();
-        } catch (\Throwable $th) {
-            send_internal_notification('CheckResaleLicenseJob failed with: ' . $th->getMessage());
-            ray($th);
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
+            ray($e);
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php
index 96fd490ba..3d08203e3 100644
--- a/app/Jobs/CleanupInstanceStuffsJob.php
+++ b/app/Jobs/CleanupInstanceStuffsJob.php
@@ -28,7 +28,7 @@ public function handle(): void
     {
         try {
             // $this->cleanup_waitlist();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             send_internal_notification('CleanupInstanceStuffsJob failed with error: ' . $e->getMessage());
             ray($e->getMessage());
             throw $e;
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index d8ad4ec12..778272705 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -90,10 +90,10 @@ public function handle(): void
             }
             $this->save_backup_logs();
             // TODO: Notify user
-        } catch (\Throwable $th) {
-            ray($th->getMessage());
-            send_internal_notification('DatabaseBackupJob failed with: ' . $th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
+            throw $e;
         }
     }
 
@@ -116,10 +116,10 @@ private function backup_standalone_postgresql(): void
 
             $this->backup_status = 'success';
             $this->team->notify(new BackupSuccess($this->backup, $this->database));
-        } catch (Throwable $th) {
+        } catch (Throwable $e) {
             $this->backup_status = 'failed';
-            $this->add_to_backup_output($th->getMessage());
-            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $th->getMessage());
+            $this->add_to_backup_output($e->getMessage());
+            ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
             $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
         } finally {
             $this->backup_log->update([
@@ -173,9 +173,9 @@ private function upload_to_s3(): void
             instant_remote_process($commands, $this->server);
             $this->add_to_backup_output('Uploaded to S3.');
             ray('Uploaded to S3. ' . $this->backup_location . ' to s3://' . $bucket . $this->backup_dir);
-        } catch (\Throwable $th) {
-            $this->add_to_backup_output($th->getMessage());
-            ray($th->getMessage());
+        } catch (\Throwable $e) {
+            $this->add_to_backup_output($e->getMessage());
+            ray($e->getMessage());
         } finally {
             $command = "docker rm -f backup-of-{$this->backup->uuid}";
             instant_remote_process([$command], $this->server);
diff --git a/app/Jobs/DatabaseContainerStatusJob.php b/app/Jobs/DatabaseContainerStatusJob.php
index 1630545c5..d7b4d0085 100644
--- a/app/Jobs/DatabaseContainerStatusJob.php
+++ b/app/Jobs/DatabaseContainerStatusJob.php
@@ -47,7 +47,7 @@ public function handle(): void
                 $this->database->status = $status;
                 $this->database->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             send_internal_notification('DatabaseContainerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());
             throw $e;
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index ecdf6dbcb..fbb9ac2c7 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -75,7 +75,7 @@ public function handle(): void
                     ray('No need to clean up ' . $server->name)->color('orange');
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
             ray($e->getMessage())->color('orange');
             throw $e;
diff --git a/app/Jobs/ProxyCheckJob.php b/app/Jobs/ProxyCheckJob.php
index 720dd2ea1..65d04bf05 100755
--- a/app/Jobs/ProxyCheckJob.php
+++ b/app/Jobs/ProxyCheckJob.php
@@ -37,10 +37,10 @@ public function handle()
                     resolve(StartProxy::class)($server);
                 }
             }
-        } catch (\Throwable $th) {
-            ray($th->getMessage());
-            send_internal_notification('ProxyCheckJob failed with: ' . $th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            send_internal_notification('ProxyCheckJob failed with: ' . $e->getMessage());
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/ProxyContainerStatusJob.php b/app/Jobs/ProxyContainerStatusJob.php
index 24ad24be0..a69c96ef3 100644
--- a/app/Jobs/ProxyContainerStatusJob.php
+++ b/app/Jobs/ProxyContainerStatusJob.php
@@ -52,7 +52,7 @@ public function handle(): void
                 }
                 $this->server->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             if ($e->getCode() === 1) {
                 $this->server->proxy->status = 'exited';
                 $this->server->save();
diff --git a/app/Jobs/ProxyStartJob.php b/app/Jobs/ProxyStartJob.php
index 91932a48c..90230ccbf 100755
--- a/app/Jobs/ProxyStartJob.php
+++ b/app/Jobs/ProxyStartJob.php
@@ -35,10 +35,10 @@ public function handle()
                 $this->server->save();
             }
             resolve(StartProxy::class)($this->server);
-        } catch (\Throwable $th) {
-            send_internal_notification('ProxyStartJob failed with: ' . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('ProxyStartJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/ResourceStatusJob.php b/app/Jobs/ResourceStatusJob.php
index efd6d1445..3e5f5a455 100644
--- a/app/Jobs/ResourceStatusJob.php
+++ b/app/Jobs/ResourceStatusJob.php
@@ -37,10 +37,10 @@ public function handle(): void
                     database: $postgresql,
                 ));
             }
-        } catch (\Exception $th) {
-            send_internal_notification('ResourceStatusJob failed with: ' . $th->getMessage());
-            ray($th);
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('ResourceStatusJob failed with: ' . $e->getMessage());
+            ray($e);
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/SendConfirmationForWaitlistJob.php b/app/Jobs/SendConfirmationForWaitlistJob.php
index a8790f27f..470b1bafe 100755
--- a/app/Jobs/SendConfirmationForWaitlistJob.php
+++ b/app/Jobs/SendConfirmationForWaitlistJob.php
@@ -34,10 +34,10 @@ public function handle()
                 ]);
             $mail->subject('You are on the waitlist!');
             send_user_an_email($mail, $this->email);
-        } catch (\Throwable $th) {
-            send_internal_notification("SendConfirmationForWaitlistJob failed for {$this->email} with error: " . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification("SendConfirmationForWaitlistJob failed for {$this->email} with error: " . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }
diff --git a/app/Jobs/SubscriptionInvoiceFailedJob.php b/app/Jobs/SubscriptionInvoiceFailedJob.php
index 48e9fea64..5e8654673 100755
--- a/app/Jobs/SubscriptionInvoiceFailedJob.php
+++ b/app/Jobs/SubscriptionInvoiceFailedJob.php
@@ -33,10 +33,10 @@ public function handle()
                     send_user_an_email($mail, $member->email);
                 }
             });
-        } catch (\Throwable $th) {
-            send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $th->getMessage());
-            ray($th->getMessage());
-            throw $th;
+        } catch (\Throwable $e) {
+            send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
         }
     }
 }
diff --git a/app/Models/PrivateKey.php b/app/Models/PrivateKey.php
index d96aecd4e..797c2efbb 100644
--- a/app/Models/PrivateKey.php
+++ b/app/Models/PrivateKey.php
@@ -24,7 +24,7 @@ public function publicKey()
     {
         try {
             return PublicKeyLoader::load($this->private_key)->getPublicKey()->toString('OpenSSH',['comment' => '']);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return 'Error loading private key';
         }
     }
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index b90f5ebd5..080448f71 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -52,7 +52,7 @@ function format_docker_envs_to_json($rawOutput)
             $env = explode('=', $env);
             return [$env[0] => $env[1]];
         });
-    } catch (\Throwable $th) {
+    } catch (\Throwable $e) {
         return collect([]);
     }
 }
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index 673c9801f..40ff2f958 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -203,7 +203,7 @@ function validateServer(Server $server)
             "uptime" => $uptime,
             "dockerVersion" => $dockerVersion,
         ];
-    } catch (\Exception $e) {
+    } catch (\Throwable $e) {
         $server->settings->is_reachable = false;
         $server->settings->is_usable = false;
         throw $e;
@@ -219,7 +219,7 @@ function check_server_connection(Server $server)
         instant_remote_process(['uptime'], $server);
         $server->unreachable_count = 0;
         $server->settings->is_reachable = true;
-    } catch (\Exception $e) {
+    } catch (\Throwable $e) {
         if ($server->unreachable_count == 2) {
             $server->team->notify(new NotReachable($server));
             $server->settings->is_reachable = false;
@@ -246,7 +246,7 @@ function checkRequiredCommands(Server $server)
         }
         try {
             instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'apt update && apt install -y {$command}'"], $server);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray('could not install ' . $command);
             ray($e);
             break;
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 7a8c5429b..edb54ab64 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -89,18 +89,18 @@ function general_error_handler(Throwable | null $err = null, $that = null, $isJs
             }
             throw new Exception($customErrorMessage ?? $err->getMessage());
         }
-    } catch (Throwable $error) {
+    } catch (Throwable $e) {
         if ($that) {
-            return $that->emit('error', $customErrorMessage ?? $error->getMessage());
+            return $that->emit('error', $customErrorMessage ?? $e->getMessage());
         } elseif ($isJson) {
             return response()->json([
-                'code' => $error->getCode(),
-                'error' => $error->getMessage(),
+                'code' => $e->getCode(),
+                'error' => $e->getMessage(),
             ]);
         } else {
             ray($customErrorMessage);
-            ray($error);
-            return $customErrorMessage ?? $error->getMessage();
+            ray($e);
+            return $customErrorMessage ?? $e->getMessage();
         }
     }
 }
@@ -116,9 +116,9 @@ function get_latest_version_of_coolify(): string
         $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
         $versions = $response->json();
         return data_get($versions, 'coolify.v4.version');
-    } catch (Throwable $th) {
-        //throw $th;
-        ray($th->getMessage());
+    } catch (Throwable $e) {
+        //throw $e;
+        ray($e->getMessage());
         return '0.0.0';
     }
 }
@@ -258,8 +258,8 @@ function send_internal_notification(string $message): void
         $baseUrl = config('app.name');
         $team = Team::find(0);
         $team->notify(new GeneralNotification("👀 {$baseUrl}: " . $message));
-    } catch (\Throwable $th) {
-        ray($th->getMessage());
+    } catch (\Throwable $e) {
+        ray($e->getMessage());
     }
 }
 function send_user_an_email(MailMessage $mail, string $email): void
diff --git a/database/seeders/InstanceSettingsSeeder.php b/database/seeders/InstanceSettingsSeeder.php
index 1be6462c9..31c8cfb5f 100644
--- a/database/seeders/InstanceSettingsSeeder.php
+++ b/database/seeders/InstanceSettingsSeeder.php
@@ -38,7 +38,7 @@ public function run(): void
             if (is_null($settings->public_ipv6) && $ipv6) {
                 $settings->update(['public_ipv6' => $ipv6]);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index 9a307c7eb..719c06df3 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -119,7 +119,7 @@ public function run(): void
                     $settings->update(['public_ipv6' => $ipv6]);
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }