diff --git a/app.py b/app.py
index f18b3fe..7af34fa 100644
--- a/app.py
+++ b/app.py
@@ -178,8 +178,11 @@ def inbox():
 def viewQuestion(question_id):
     question = func.getQuestion(question_id)
     answer = func.getAnswer(question_id)
-    metadata = func.generateMetadata(question, answer)
-    return render_template('view_question.html', question=question, urllib=urllib, answer=answer, metadata=metadata, formatRelativeTime=func.formatRelativeTime, trimContent=func.trimContent)
+    if not question or not answer:
+        return abort(404)
+    else:
+        metadata = func.generateMetadata(question, answer)
+        return render_template('view_question.html', question=question, urllib=urllib, answer=answer, metadata=metadata, formatRelativeTime=func.formatRelativeTime, trimContent=func.trimContent)
 
 # TODO: implement this and private questions should be here too
 """