2 files changed, 6 insertions, 2 deletions

diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 18aab87..1594a43 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -21,7 +21,7 @@ import re
 import os
 
 import django.utils.simplejson as simplejson
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.template import RequestContext, loader
 from django.conf import settings
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage
@@ -45,6 +45,8 @@ def index (request, mlist_fqdn, hashid):
     t = loader.get_template('message.html')
     store = get_store(request)
     message = store.get_message_by_hash_from_list(mlist_fqdn, hashid)
+    if message is None:
+        raise Http404
     message.sender_email = message.sender_email.strip()
     # Extract all the votes for this message
     try:
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index cef8b58..48106d0 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -21,7 +21,7 @@ import datetime
 
 import django.utils.simplejson as simplejson
 
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.template import RequestContext, loader
 from django.conf import settings
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage
@@ -43,6 +43,8 @@ def thread_index (request, mlist_fqdn, threadid):
     t = loader.get_template('thread.html')
     store = get_store(request)
     messages = store.get_messages_in_thread(mlist_fqdn, threadid)
+    if not messages:
+        raise Http404
     #prev_thread = mongo.get_thread_name(list_name, int(threadid) - 1)
     prev_thread = []
     if len(prev_thread) > 30: