diff --git a/digitalglarus/views.py b/digitalglarus/views.py
index 32d8e1f5..f99577c5 100644
--- a/digitalglarus/views.py
+++ b/digitalglarus/views.py
@@ -2,7 +2,7 @@ import logging
 
 from django.conf import settings
 from django.shortcuts import render
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, Http404
 from django.core.urlresolvers import reverse_lazy, reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, UpdateView
@@ -834,8 +834,9 @@ class ContactView(FormView):
 
 def blog(request):
     tags = ["digitalglarus"]
-    posts = Post.objects.filter(tags__name__in=tags, publish=True).translated(get_language())
-    # posts = Post.objects.filter_by_language(get_language()).filter(tags__name__in=tags, publish=True)
+    posts = (Post.objects
+                 .filter(tags__name__in=tags, publish=True)
+                 .translated(get_language()))
     context = {
         'post_list': posts,
     }
@@ -843,9 +844,9 @@ def blog(request):
 
 
 def blog_detail(request, slug):
-    # post = Post.objects.filter_by_language(get_language()).filter(slug=slug).first()
-
     post = Post.objects.translated(get_language(), slug=slug).first()
+    if post is None:
+        raise Http404()
     context = {
         'post': post,
     }