diff --git a/static/i18n/hy.json b/static/i18n/hy.json
index b1963af2..37623632 100644
--- a/static/i18n/hy.json
+++ b/static/i18n/hy.json
@@ -5,4 +5,5 @@
 	},
 	"name":"Հայերեն",
 	"suggest-full-text-search": "որոնել '{{{SEARCH_TERMS}}}'..."
+	, "url-not-found" : "Սխալ հասցե՝ {{url}}"
 }
diff --git a/test/server.cpp b/test/server.cpp
index d56f22d5..7508a7bf 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -587,6 +587,14 @@ TEST_F(ServerTest, 404WithBodyTesting)
     </p>
 )"  },
 
+    { /* url */ "/ROOT/catalog/?userlang=hy",
+      expected_body==R"(
+    <h1>Not Found</h1>
+    <p>
+      Սխալ հասցե՝ /ROOT/catalog/
+    </p>
+)"  },
+
     { /* url */ "/ROOT/catalog/invalid_endpoint",
       expected_body==R"(
     <h1>Not Found</h1>
@@ -595,6 +603,14 @@ TEST_F(ServerTest, 404WithBodyTesting)
     </p>
 )"  },
 
+    { /* url */ "/ROOT/catalog/invalid_endpoint?userlang=hy",
+      expected_body==R"(
+    <h1>Not Found</h1>
+    <p>
+      Սխալ հասցե՝ /ROOT/catalog/invalid_endpoint
+    </p>
+)"  },
+
     { /* url */ "/ROOT/invalid-book/whatever",
       expected_body==R"(
     <h1>Not Found</h1>