diff --git a/client/src/locale/en/translation.json b/client/src/locale/en/translation.json
index de4c31f..3a8ffaf 100644
--- a/client/src/locale/en/translation.json
+++ b/client/src/locale/en/translation.json
@@ -6,19 +6,21 @@
   "are_composing_2": "{{member0}} and {{member1}} are writing",
   "are_composing_3": "{{member0}}, {{member1}} and {{member2}} are writing",
   "are_composing_more": "{{member0}}, {{member1}}, {{member2}} +{{excess}} are writing",
-  "contact_block": "Block this contact",
-  "contact_confirm_block": "Block",
   "calling": "Calling {{member0}}",
   "change_picture": "Change the picture",
   "connecting": "Connecting...",
   "connecting_call": "Connecting...",
+  "contact_ask_confirm_block": "Do you want to block this contact?",
+  "contact_ask_confirm_remove": "Do you want to remove this contact?",
+  "contact_block": "Block this contact",
+  "contact_confirm_block": "Block",
+  "contact_confirm_remove": "Remove",
   "contact_details_dialog_title": "Info",
   "contact_details_identifier": "Identifier",
   "contact_details_name": "Contact Name",
   "contact_details_qr_code": "QR Code",
   "contact_details_text": "Contact Details",
-  "contact_ask_confirm_block": "Do you want to block this contact?",
-  "contact_ask_confirm_remove": "Do you want to remove this contact?",
+  "contact_remove": "Remove this contact",
   "conversation_add_contact": "Add contact",
   "conversation_add_contact_form": "Add a contact",
   "conversation_ask_confirm_block": "Would you really like to block this conversation?",
@@ -49,8 +51,6 @@
   "conversation_title_4": "{{member0}}, {{member1}}, {{member2}}, +1 other member",
   "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
   "conversations": "Conversations",
-  "contact_remove": "Remove this contact",
-  "contact_confirm_remove": "Remove",
   "dialog_cancel": "Cancel",
   "dialog_close": "Close",
   "dialog_confirm_title_default": "Confirm action",
@@ -142,6 +142,7 @@
   "share_screen": "Share your screen",
   "share_screen_area": "Share an area of your screen",
   "share_window": "Share window",
+  "unknown_error_alert": "Something went wrong, please try again",
   "username_input_helper_text": "",
   "username_input_helper_text_invalid": "Username doesn't follow required pattern",
   "username_input_helper_text_registration_failed": "Username not correct!",
diff --git a/client/src/locale/fr/translation.json b/client/src/locale/fr/translation.json
index 615193d..c92e201 100644
--- a/client/src/locale/fr/translation.json
+++ b/client/src/locale/fr/translation.json
@@ -6,19 +6,21 @@
   "are_composing_2": "{{member0}} et {{member1}} sont en train d'écrire",
   "are_composing_3": "{{member0}}, {{member1}} et {{member2}} sont en train d'écrire",
   "are_composing_more": "{{member0}}, {{member1}}, {{member2}} +{{excess}} sont en train d'écrire",
-  "contact_block": "Bloquer le contact",
-  "contact_confirm_block": "Bloquer",
   "calling": "Appel vers {{member0}}",
   "change_picture": "Modifier l'image",
   "connecting": "Connexion en cours...",
   "connecting_call": "Connexion...",
+  "contact_ask_confirm_block": "Voulez-vous vraiment bloquer ce contact?",
+  "contact_ask_confirm_remove": "Voulez-vous vraiment supprimer ce contact?",
+  "contact_block": "Bloquer le contact",
+  "contact_confirm_block": "Bloquer",
+  "contact_confirm_remove": "supprimer",
   "contact_details_dialog_title": "Informations",
   "contact_details_identifier": "Identifiant",
   "contact_details_name": "Nom du contact",
   "contact_details_qr_code": "Code QR",
   "contact_details_text": "Détails du contact",
-  "contact_ask_confirm_block": "Voulez-vous vraiment bloquer ce contact?",
-  "contact_ask_confirm_remove": "Voulez-vous vraiment supprimer ce contact?",
+  "contact_remove": "Supprimer le contact",
   "conversation_add_contact": "Ajouter le contact",
   "conversation_add_contact_form": "Ajouter un contact",
   "conversation_ask_confirm_block": "Souhaitez-vous vraiment bloquer cette conversation ?",
@@ -49,8 +51,6 @@
   "conversation_title_4": "{{member0}}, {{member1}}, {{member2}}, +1 autre membre",
   "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} autres membres",
   "conversations": "Conversations",
-  "contact_remove": "Supprimer le contact",
-  "contact_confirm_remove": "supprimer",
   "dialog_cancel": "Annuler",
   "dialog_close": "Fermer",
   "dialog_confirm_title_default": "Merci de confirmer",
@@ -142,6 +142,7 @@
   "share_screen": "Partager votre écran",
   "share_screen_area": "Partager une partie de l'écran",
   "share_window": "Partager la fenêtre",
+  "unknown_error_alert": "Une erreur s'est produite. Veuillez réessayer",
   "username_input_helper_text": "",
   "username_input_helper_text_invalid": "Le nom d'utilisateur ne suit pas le modèle",
   "username_input_helper_text_registration_failed": "Nom d'utilisateur incorrect!",
diff --git a/client/src/pages/Login.tsx b/client/src/pages/Login.tsx
index 5887bb3..193497b 100644
--- a/client/src/pages/Login.tsx
+++ b/client/src/pages/Login.tsx
@@ -78,7 +78,7 @@
         } else if (e instanceof InvalidPassword) {
           setErrorAlertContent(t('login_invalid_password'));
         } else {
-          throw e;
+          setErrorAlertContent(t('unknown_error_alert'));
         }
       }
     }
diff --git a/client/src/pages/Registration.tsx b/client/src/pages/Registration.tsx
index acbf8f9..50686f5 100644
--- a/client/src/pages/Registration.tsx
+++ b/client/src/pages/Registration.tsx
@@ -89,7 +89,7 @@
       } else if (e instanceof InvalidPassword) {
         setErrorAlertContent(t('login_invalid_password'));
       } else {
-        throw e;
+        setErrorAlertContent(t('unknown_error_alert'));
       }
     }
   };
@@ -108,7 +108,7 @@
       } else if (e instanceof InvalidCredentials) {
         setErrorAlertContent(t('login_invalid_credentials'));
       } else {
-        throw e;
+        setErrorAlertContent(t('unknown_error_alert'));
       }
     }
   };