diff --git a/src/main/resources/messages/messages_de.properties b/src/main/resources/messages/messages_de.properties
index 8d208410c..89a08eaad 100644
--- a/src/main/resources/messages/messages_de.properties
+++ b/src/main/resources/messages/messages_de.properties
@@ -46,3 +46,6 @@ visitDate=Besuchsdatum
editOwner=Besitzer bearbeiten
addNewPet=Neues Haustier hinzufügen
petsAndVisits=Haustiere und Besuche
+error.404=Die angeforderte Seite wurde nicht gefunden.
+error.500=Ein interner Serverfehler ist aufgetreten.
+error.general=Ein unerwarteter Fehler ist aufgetreten.
diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
index 91d5c9ebd..911d7337f 100644
--- a/src/main/resources/messages/messages_es.properties
+++ b/src/main/resources/messages/messages_es.properties
@@ -46,3 +46,6 @@ visitDate=Fecha de visita
editOwner=Editar propietario
addNewPet=Agregar nueva mascota
petsAndVisits=Mascotas y visitas
+error.404=La página solicitada no fue encontrada.
+error.500=Ocurrió un error interno del servidor.
+error.general=Ocurrió un error inesperado.
diff --git a/src/main/resources/messages/messages_fa.properties b/src/main/resources/messages/messages_fa.properties
index 2566b8949..6d0994a92 100644
--- a/src/main/resources/messages/messages_fa.properties
+++ b/src/main/resources/messages/messages_fa.properties
@@ -46,3 +46,6 @@ visitDate=تاریخ ویزیت
editOwner=ویرایش مالک
addNewPet=افزودن حیوان خانگی جدید
petsAndVisits=حیوانات و ویزیتها
+error.404=صفحه درخواستی پیدا نشد.
+error.500=خطای داخلی سرور رخ داد.
+error.general=خطای غیرمنتظرهای رخ داد.
diff --git a/src/main/resources/messages/messages_ko.properties b/src/main/resources/messages/messages_ko.properties
index ca3ae5a05..6e2f4880a 100644
--- a/src/main/resources/messages/messages_ko.properties
+++ b/src/main/resources/messages/messages_ko.properties
@@ -46,3 +46,6 @@ visitDate=방문 날짜
editOwner=소유자 수정
addNewPet=새 반려동물 추가
petsAndVisits=반려동물 및 방문
+error.404=요청하신 페이지를 찾을 수 없습니다.
+error.500=서버 내부 오류가 발생했습니다.
+error.general=알 수 없는 오류가 발생했습니다.
diff --git a/src/main/resources/messages/messages_pt.properties b/src/main/resources/messages/messages_pt.properties
index 03f5cd531..7eea4b9d1 100644
--- a/src/main/resources/messages/messages_pt.properties
+++ b/src/main/resources/messages/messages_pt.properties
@@ -46,3 +46,6 @@ visitDate=Data da visita
editOwner=Editar proprietário
addNewPet=Adicionar novo animal
petsAndVisits=Animais e visitas
+error.404=A página solicitada não foi encontrada.
+error.500=Ocorreu um erro interno no servidor.
+error.general=Ocorreu um erro inesperado.
diff --git a/src/main/resources/messages/messages_ru.properties b/src/main/resources/messages/messages_ru.properties
index b9ed998be..f06d2cb6c 100644
--- a/src/main/resources/messages/messages_ru.properties
+++ b/src/main/resources/messages/messages_ru.properties
@@ -46,3 +46,6 @@ visitDate=Дата визита
editOwner=Редактировать владельца
addNewPet=Добавить нового питомца
petsAndVisits=Питомцы и визиты
+error.404=Запрашиваемая страница не найдена.
+error.500=Произошла внутренняя ошибка сервера.
+error.general=Произошла непредвиденная ошибка.
diff --git a/src/main/resources/messages/messages_tr.properties b/src/main/resources/messages/messages_tr.properties
index ff9ffdabd..2c806f9e6 100644
--- a/src/main/resources/messages/messages_tr.properties
+++ b/src/main/resources/messages/messages_tr.properties
@@ -46,3 +46,6 @@ visitDate=Ziyaret Tarihi
editOwner=Sahibi Düzenle
addNewPet=Yeni Evcil Hayvan Ekle
petsAndVisits=Evcil Hayvanlar ve Ziyaretler
+error.404=İstenen sayfa bulunamadı.
+error.500=Sunucuda dahili bir hata oluştu.
+error.general=Beklenmeyen bir hata oluştu.
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index 4d76d8d16..5f1d6f3ab 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -4,8 +4,18 @@
+
Something happened...
+
+
+
+ The requested page was not found.
+ An internal server error occurred.
+ An unexpected error occurred.
+
+
+
Exception message
-