1 files changed, 4 insertions, 3 deletions
diff --git a/apioforum/forum.py b/apioforum/forum.py
index 289cc40..b86fcc9 100644
--- a/apioforum/forum.py
+++ b/apioforum/forum.py
@@ -106,8 +106,6 @@ def set_updated(forum_id):
 @forum_route("",pagination=True)
 @requires_permission("p_view_forum", login_required=False)
 def view_forum(forum,page=1):
-    if page < 1:
-        abort(400)
     db = get_db()
 
     sortby = request.args.get("sortby","ad")
@@ -171,8 +169,11 @@ def view_forum(forum,page=1):
         LEFT OUTER JOIN thread_tags ON threads.id = thread_tags.thread
         WHERE threads.forum = ? {tagfilter_clause};
     """,(forum['id'],)).fetchone()['count']
-
     max_pageno = math.ceil(num_threads/THREADS_PER_PAGE)
+    if page < 1:
+        abort(404)
+    elif page > max_pageno and (max_pageno > 0 or page != 1):
+        abort(404)
     
     thread_tags = {}
     thread_polls = {}