diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html
index 0888dc4..68503ba 100644
--- a/src/postorius/templates/postorius/base.html
+++ b/src/postorius/templates/postorius/base.html
@@ -44,6 +44,8 @@
     </header>
 
     <div class="mm_main mm_canvas">
+	{% if error %}
+	{% else %}
         {% if messages %}
             <ul class="mm_messages">
             {% for message in messages %}
@@ -51,6 +53,7 @@
             {% endfor %}
             </ul>
         {% endif %}
+	{% endif %}
         {% block main %}{% endblock main %}
     </div>
 
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html
index 3716562..86031b9 100644
--- a/src/postorius/templates/postorius/errors/generic.html
+++ b/src/postorius/templates/postorius/errors/generic.html
@@ -5,5 +5,5 @@
 {% block main %}
     <h1>{% trans 'Something went wrong' %}</h1>
 
-    {% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %}
+    {% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %} 
 {% endblock %}
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 2a5696e..4fe135f 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -239,7 +239,6 @@
                                 fqdn_listname=mailing_list.fqdn_listname)
             #TODO catch correct Error class:
             except HTTPError, e:
-                messages.error(request, e)
                 return render_to_response(
                     'postorius/errors/generic.html',
                     {'error': e}, context_instance=RequestContext(request))