diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb
index 59f5719b0..d463699be 100644
--- a/assets/l10n/intl_es.arb
+++ b/assets/l10n/intl_es.arb
@@ -4634,5 +4634,22 @@
   "points": "Puntos",
   "noPaymentInfo": "No se necesitan datos de pago.",
   "updatePhoneOS": "Puede que necesites actualizar la versión del sistema operativo de tu dispositivo.",
-  "wordsPerMinute": "Palabras por minuto"
+  "wordsPerMinute": "Palabras por minuto",
+  "conversationBotModeSelectDescription": "Modo bot",
+  "conversationBotModeSelectOption_discussion": "Debate",
+  "conversationBotModeSelectOption_custom": "A medida",
+  "conversationBotModeSelectOption_conversation": "Conversación",
+  "conversationBotModeSelectOption_textAdventure": "Aventura textual",
+  "conversationBotDiscussionZone_title": "Configuración del debate",
+  "conversationBotDiscussionZone_discussionTopicLabel": "Tema de debate",
+  "conversationBotDiscussionZone_discussionTopicPlaceholder": "Establecer tema de debate",
+  "conversationBotDiscussionZone_discussionKeywordsLabel": "Palabras clave del debate",
+  "conversationBotDiscussionZone_discussionKeywordsPlaceholder": "Establecer palabras clave de debate",
+  "conversationBotDiscussionZone_discussionKeywordsHintText": "Lista de palabras clave separadas por comas para orientar el debate",
+  "conversationBotDiscussionZone_discussionTriggerScheduleEnabledLabel": "Enviar mensajes de debate según un calendario",
+  "conversationBotDiscussionZone_discussionTriggerScheduleHourIntervalLabel": "Horas entre temas de debate",
+  "conversationBotDiscussionZone_discussionTriggerReactionEnabledLabel": "Enviar aviso de discusión cuando el usuario reacciona ⏩ al mensaje del bot.",
+  "conversationBotDiscussionZone_discussionTriggerReactionKeyLabel": "Reacción al envío del aviso de debate",
+  "studentAnalyticsNotAvailable": "Datos de los estudiantes no disponibles actualmente",
+  "roomDataMissing": "Es posible que falten algunos datos de las salas de las que no es miembro."
 }
\ No newline at end of file
diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
index 301d0c6ee..e1a8b99d5 100644
--- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
+++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
@@ -1,20 +1,16 @@
 import 'dart:io';
 
+import 'package:fluffychat/pangea/utils/error_handler.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/foundation.dart';
-
-import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sqflite_common_ffi/sqflite_ffi.dart';
 import 'package:universal_html/html.dart' as html;
 
-import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/utils/client_manager.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart';
-import 'package:fluffychat/utils/platform_infos.dart';
 import 'cipher.dart';
-
 import 'sqlcipher_stub.dart'
     if (dart.library.io) 'package:sqlcipher_flutter_libs/sqlcipher_flutter_libs.dart';
 
@@ -24,25 +20,49 @@ Future<DatabaseApi> flutterMatrixSdkDatabaseBuilder(Client client) async {
     database = await _constructDatabase(client);
     await database.open();
     return database;
-  } catch (e) {
+    // #Pangea
+    // } catch (e) {
+  } catch (e, s) {
+    ErrorHandler.logError(
+      e: e,
+      s: s,
+      m: "Failed to open matrix sdk database. Openning fallback database.",
+    );
+    // Pangea#
     // Try to delete database so that it can created again on next init:
     database?.delete().catchError(
-          (e, s) => Logs().w(
-            'Unable to delete database, after failed construction',
-            e,
-            s,
-          ),
+        // #Pangea
+        // (e, s) => Logs().w(
+        //   'Unable to delete database, after failed construction',
+        //   e,
+        //   s,
+        // ),
+        (e, s) {
+      Logs().w(
+        'Unable to delete database, after failed construction',
+        e,
+        s,
+      );
+      ErrorHandler.logError(
+        e: e,
+        s: s,
+        m: "Failed to delete matrix database after failed construction.",
+      );
+    }
+        // Pangea#
         );
 
     // Send error notification:
-    final l10n = lookupL10n(PlatformDispatcher.instance.locale);
-    ClientManager.sendInitNotification(
-      l10n.initAppError,
-      l10n.databaseBuildErrorBody(
-        AppConfig.newIssueUrl.toString(),
-        e.toString(),
-      ),
-    );
+    // #Pangea
+    // final l10n = lookupL10n(PlatformDispatcher.instance.locale);
+    // ClientManager.sendInitNotification(
+    //   l10n.initAppError,
+    //   l10n.databaseBuildErrorBody(
+    //     AppConfig.newIssueUrl.toString(),
+    //     e.toString(),
+    //   ),
+    // );
+    // Pangea#
 
     return FlutterHiveCollectionsDatabase.databaseBuilder(client);
   }
diff --git a/needed-translations.txt b/needed-translations.txt
index af36b97ba..bb967d011 100644
--- a/needed-translations.txt
+++ b/needed-translations.txt
@@ -8527,26 +8527,6 @@
     "wordsPerMinute"
   ],
 
-  "es": [
-    "conversationBotModeSelectDescription",
-    "conversationBotModeSelectOption_discussion",
-    "conversationBotModeSelectOption_custom",
-    "conversationBotModeSelectOption_conversation",
-    "conversationBotModeSelectOption_textAdventure",
-    "conversationBotDiscussionZone_title",
-    "conversationBotDiscussionZone_discussionTopicLabel",
-    "conversationBotDiscussionZone_discussionTopicPlaceholder",
-    "conversationBotDiscussionZone_discussionKeywordsLabel",
-    "conversationBotDiscussionZone_discussionKeywordsPlaceholder",
-    "conversationBotDiscussionZone_discussionKeywordsHintText",
-    "conversationBotDiscussionZone_discussionTriggerScheduleEnabledLabel",
-    "conversationBotDiscussionZone_discussionTriggerScheduleHourIntervalLabel",
-    "conversationBotDiscussionZone_discussionTriggerReactionEnabledLabel",
-    "conversationBotDiscussionZone_discussionTriggerReactionKeyLabel",
-    "studentAnalyticsNotAvailable",
-    "roomDataMissing"
-  ],
-
   "et": [
     "accountInformation",
     "addGroupDescription",