diff --git a/bookstore/src/main/resources/messages.properties b/bookstore/src/main/resources/messages.properties
index 7d411c6..39abe74 100644
--- a/bookstore/src/main/resources/messages.properties
+++ b/bookstore/src/main/resources/messages.properties
@@ -36,15 +36,19 @@ book.error.price = Invalid price
page.title.browser.list = Bookstore page
page.title.browser.add = Add book
page.title.browser.edit = Update book
+page.title.browser.error = Error page
page.title.webform.list = Books
page.title.webform.add = Add new book
page.title.webform.edit = Update existing book
+page.title.webform.error = Error
page.text.list.actions = Actions
page.text.list.delete = Delete
page.text.list.edit = Edit
+page.text.error = Error while processing your request
+
button.book.add = Add book
button.book.edit = Update book
diff --git a/bookstore/src/main/resources/templates/error.html b/bookstore/src/main/resources/templates/error.html
index 8b6fa58..86ead1c 100644
--- a/bookstore/src/main/resources/templates/error.html
+++ b/bookstore/src/main/resources/templates/error.html
@@ -1,10 +1,25 @@
-
+
-
- Error page
+
+
+
+
+
+
+ page.title.browser.error
+
+
- Error while processing your request.
+
+
+ page.title.webform.error
+
+
+ page.text.error
+
+