diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index b385a143..b567e8ec 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -13,25 +13,26 @@
     {% endblock %}{% endblock %}
   </h2>
 
+  {% if dead %}
   <div class="odpocet">
     Do konce odeslání řešení zbývá:
-
     {{ted|timesince:dead}}
 
     <!-- 
-     {{cas_do_konce_dni}} dní
-     {% if cas_do_konce_dni < 5 %}
-       {{cas_do_konce_hodin}} hodin
-       {% if cas_do_konce_hodin < 5 %}
-         {{cas_do_konce_minut}} minut
-         {% if cas_do_konce_minut < 5 %}
-           {{cas_do_konce_sekund}}
-         {% endif %}
-       {% endif %}
-     {% endif %}
+    {{cas_do_konce_dni}} dní
+    {% if cas_do_konce_dni < 5 %}
+      {{cas_do_konce_hodin}} hodin
+      {% if cas_do_konce_hodin < 5 %}
+        {{cas_do_konce_minut}} minut
+        {% if cas_do_konce_minut < 5 %}
+          {{cas_do_konce_sekund}}
+        {% endif %}
+      {% endif %}
+    {% endif %}
     -->
-     
+ 
   </div>
+  {% endif %}
 
   <p> <center>
   My jsme M&M, mezioborový korespondenční seminář.
diff --git a/seminar/views.py b/seminar/views.py
index d7cdbfad..8762861b 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -48,14 +48,17 @@ class TitulniStranaView(generic.ListView):
         context = super(TitulniStranaView, self).get_context_data(**kwargs)
         nastaveni = get_object_or_404(Nastaveni)
         cas_deadline = nastaveni.aktualni_cislo.datum_deadline
-        rozdil_casu =  datetime.combine(cas_deadline, datetime.max.time()) \
-                - datetime.now()
-        context['cas_do_konce_dni']    = rozdil_casu.days
-        context['cas_do_konce_hodin']  = rozdil_casu.seconds / 3600
-        context['cas_do_konce_minut'] = (rozdil_casu.seconds / 60) % 60
-        context['cas_do_konce_sekund'] = rozdil_casu.seconds % 60
-        context['dead'] = datetime.combine(cas_deadline, datetime.max.time())
-        context['ted'] = datetime.now()
+        try:
+          rozdil_casu =  datetime.combine(cas_deadline, datetime.max.time()) \
+                  - datetime.now()
+          context['cas_do_konce_dni']    = rozdil_casu.days
+          context['cas_do_konce_hodin']  = rozdil_casu.seconds / 3600
+          context['cas_do_konce_minut'] = (rozdil_casu.seconds / 60) % 60
+          context['cas_do_konce_sekund'] = rozdil_casu.seconds % 60
+          context['dead'] = datetime.combine(cas_deadline, datetime.max.time())
+          context['ted'] = datetime.now()
+        except:
+            context['dead'] = None
         return context
 
 class StareNovinkyView(generic.ListView):