diff --git a/controller/action/ContentActions.class.php b/controller/action/ContentActions.class.php
index 07b216c1..5e8faf84 100644
--- a/controller/action/ContentActions.class.php
+++ b/controller/action/ContentActions.class.php
@@ -103,8 +103,11 @@ class ContentActions extends Actions
 
   public static function executeFaqPost($relativeUri)
   {
-    $post = Post::load(ltrim($relativeUri, '/'));
-    if (!$post)
+    try
+    {
+      $post = Post::load(ltrim($relativeUri, '/'));
+    }
+    catch (PostNotFoundException $e)
     {
       return ['page/404', []];
     }