diff --git a/nsupdate/context_processors.py b/nsupdate/context_processors.py
index acf022f..948b38d 100644
--- a/nsupdate/context_processors.py
+++ b/nsupdate/context_processors.py
@@ -13,6 +13,7 @@ from .main.dnstools import put_ip_into_session
from .main.iptools import normalize_ip
from django.conf import settings
+from django.db import OperationalError
MAX_IP_AGE = 180 # seconds
@@ -63,5 +64,11 @@ def update_ips(request):
# if we have a new session (== not loaded from database / storage), we
# MUST save it here to create its session_key as the base.html template
# uses .session_key to build the URL for detectip:
- s.save()
+ try:
+ s.save()
+ except OperationalError:
+ # if e.g. the database is locked (sqlite), do not blow up here,
+ # because it gives rather ugly tracebacks in the email even if django
+ # was just rendering the 404 template for the current request, see #356.
+ pass
return {}
diff --git a/nsupdate/templates/errorpage.html b/nsupdate/templates/errorpage.html
index 92f0da4..3a9a20f 100644
--- a/nsupdate/templates/errorpage.html
+++ b/nsupdate/templates/errorpage.html
@@ -1,10 +1,14 @@
-{% extends "base.html" %}
-{% load i18n %}{% load bootstrap %}
+
+
+
+
+ {{ WWW_HOST }} - something went wrong...
+
+
-{% block content %}
-
- {% block error %}
- {% endblock %}
-
-{% endblock %}
+ {% block error %}
+ {% endblock %}
+ Back to {{ WWW_HOST }}.
+
+