diff --git a/app/cli.php b/app/cli.php
index ecff5180a2..23502ec402 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -197,8 +197,12 @@ CLI::setResource('logError', function (Registry $register) {
             $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $responseCode = $logger->addLog($log);
-            Console::info('Usage stats log pushed with status code: ' . $responseCode);
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
         }
 
         Console::warning("Failed: {$error->getMessage()}");
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 0bbfa2b694..04554a940e 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -863,8 +863,12 @@ App::error()
             $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $responseCode = $logger->addLog($log);
-            Console::info('Log pushed with status code: ' . $responseCode);
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
         }
 
         /** Wrap all exceptions inside Appwrite\Extend\Exception */
diff --git a/app/http.php b/app/http.php
index 7e1291142b..bec772c770 100644
--- a/app/http.php
+++ b/app/http.php
@@ -298,8 +298,12 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
             $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $responseCode = $logger->addLog($log);
-            Console::info('Log pushed with status code: ' . $responseCode);
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
         }
 
         Console::error('[Error] Type: ' . get_class($th));
diff --git a/app/realtime.php b/app/realtime.php
index b8fdb2cf21..39e00f7dda 100644
--- a/app/realtime.php
+++ b/app/realtime.php
@@ -184,8 +184,12 @@ $logError = function (Throwable $error, string $action) use ($register) {
         $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
         $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-        $responseCode = $logger->addLog($log);
-        Console::info('Realtime log pushed with status code: ' . $responseCode);
+        try {
+            $responseCode = $logger->addLog($log);
+            Console::info('Error log pushed with status code: ' . $responseCode);
+        } catch (Throwable $th) {
+            Console::error('Error pushing log: ' . $th->getMessage());
+        }
     }
 
     Console::error('[Error] Type: ' . get_class($error));
diff --git a/app/worker.php b/app/worker.php
index 9bcdae78e6..6078a0127c 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -346,8 +346,12 @@ $worker
             $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $responseCode = $logger->addLog($log);
-            Console::info('Usage stats log pushed with status code: ' . $responseCode);
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
         }
 
         Console::error('[Error] Type: ' . get_class($error));
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index c70d9ca11b..4f8953a270 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -503,7 +503,18 @@ class Deletes extends Action
 
             foreach ($collections as $collection) {
                 if ($dsn->getHost() !== System::getEnv('_APP_DATABASE_SHARED_TABLES', '') || !\in_array($collection->getId(), $projectCollectionIds)) {
-                    $dbForProject->deleteCollection($collection->getId());
+                    try {
+                        $dbForProject->deleteCollection($collection->getId());
+                    } catch (Throwable $e) {
+                        Console::error('Error deleting '.$collection->getId().' '.$e->getMessage());
+
+                        /**
+                         * Ignore junction tables;
+                         */
+                        if (!preg_match('/^_\d+_\d+$/', $collection->getId())) {
+                            throw $e;
+                        }
+                    }
                 } else {
                     $this->deleteByGroup($collection->getId(), [], database: $dbForProject);
                 }