diff --git a/src/IDF/Middleware.php b/src/IDF/Middleware.php
index 0cf5cd0..ed3ce4b 100644
--- a/src/IDF/Middleware.php
+++ b/src/IDF/Middleware.php
@@ -48,7 +48,7 @@ class IDF_Middleware
             try {
                 $request->project = IDF_Project::getOr404($match[1]);
             } catch (Pluf_HTTP_Error404 $e) {
-                return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($request->query)));
+                return new Pluf_HTTP_Response_NotFound($request);
             }
             $request->conf = new IDF_Conf();
             $request->conf->setProject($request->project);
diff --git a/src/IDF/Views/Wiki.php b/src/IDF/Views/Wiki.php
index a2ba561..6d991a5 100644
--- a/src/IDF/Views/Wiki.php
+++ b/src/IDF/Views/Wiki.php
@@ -216,7 +216,7 @@ class IDF_Views_Wiki
                             array($prj->id, $match[2]));
         $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));
         if ($pages->count() != 1) {
-            throw new Pluf_HTTP_Error404($request);
+            throw new Pluf_HTTP_Response_NotFound($request);
         }
         $page = $pages[0];
         $oldrev = false;
@@ -225,7 +225,7 @@ class IDF_Views_Wiki
             $oldrev = Pluf_Shortcuts_GetObjectOr404('IDF_WikiRevision',
                                                     $request->GET['rev']);
             if ($oldrev->wikipage != $page->id or $oldrev->is_head == true) {
-                throw new Pluf_HTTP_Error404($request);
+                throw new Pluf_HTTP_Response_NotFound($request);
             }
         }
         $ptags = self::getWikiTags($prj);