diff --git a/proj/urls.py b/proj/urls.py
index 86da57f1..3305987c 100644
--- a/proj/urls.py
+++ b/proj/urls.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.conf.urls import patterns, include, url
 from core.simple_index_view import AdvertisingView, AboutView
-from views import MainPageView, Temp404
+from views import MainPageView
 from django.contrib.sitemaps import views
 import debug_toolbar
 from django.views.generic.base import TemplateView
@@ -12,9 +12,6 @@ class Robot(TemplateView):
     content_type = 'text/plain'
 
 
-from django.contrib.sitemaps import Sitemap
-from exposition.models import Exposition
-
 from sitemaps import ExpoCard, ExpoCity, ExpoCountry, ExpoTheme, ExpoTag, ConfCard, ConfCity, ConfCountry, ConfTheme,\
     ConfTag, NewsSiteMap, BlogsSiteMap, Additional, Important
 
@@ -26,12 +23,11 @@ sitemaps = {
     'conference_theme': ConfTheme(), 'conference_tag': ConfTag(), 'main': Important(), 'additional': Additional()
 }
 
-
+handler404 = 'proj.views.error404'
 
 urlpatterns = patterns('',
     #url(r'^__debug__/', include(debug_toolbar.urls)),
     url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}),
-    url(r'^temp-404/$', Temp404.as_view()),
     url(r'^admin/', include('proj.admin_urls')),
     #url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
     url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}),
diff --git a/proj/views.py b/proj/views.py
index 46eb2679..b307f98e 100644
--- a/proj/views.py
+++ b/proj/views.py
@@ -32,16 +32,12 @@ def expo_context(request):
         cont.update({'search_form': ExpositionSearchForm()})
     return cont
 
-
-class Temp404(TemplateView):
-    template_name = 'client/404_test.html'
-    def get_context_data(self, **kwargs):
-        context = super(Temp404, self).get_context_data(**kwargs)
-        expo_themes = Theme.active.expo_themes_with_count()
-        conf_themes = Theme.active.conference_themes_with_count()
-        context.update({'expo_themes': expo_themes, 'conf_themes': conf_themes})
-        return context
-
+def error404(request):
+    context = {}
+    expo_themes = Theme.active.expo_themes_with_count()
+    conf_themes = Theme.active.conference_themes_with_count()
+    context.update({'expo_themes': expo_themes, 'conf_themes': conf_themes})
+    return render_to_response('client/404.html', context, context_instance=RequestContext(request))
 
 class MainPageView(JitterCacheMixin,TemplateView):
     cache_range = settings.CACHE_RANGE
diff --git a/templates/client/404_test.html b/templates/client/404.html
similarity index 100%
rename from templates/client/404_test.html
rename to templates/client/404.html