diff --git a/src/postorius/models.py b/src/postorius/models.py
index f27b778..79e2b39 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -21,7 +21,7 @@
 from django.conf import settings
 from django.db import models
 from django.http import Http404
-from mailman.client import Client
+from mailman.client import Client, MailmanConnectionError
 from urllib2 import HTTPError
 
 
@@ -54,6 +54,8 @@
             return getattr(self.client, self.resource_name_plural)
         except AttributeError:
             raise MailmanApiError
+        except MailmanConnectionError, e:
+            raise MailmanApiError(e)
 
     def get(self, **kwargs):
         try:
@@ -66,6 +68,9 @@
                 raise Mailman404Error
             else:
                 raise
+        except MailmanConnectionError, e:
+            raise MailmanApiError(e)
+
 
     def get_or_404(self, **kwargs):
         """Similar to `self.get` but raises standard Django 404 error.
@@ -74,6 +79,8 @@
             return self.get(**kwargs)
         except Mailman404Error:
             raise Http404
+        except MailmanConnectionError:
+            raise MailmanApiError
 
     def create(self, **kwargs):
         try:
@@ -86,6 +93,8 @@
                 raise MailmanApiError
             else:
                 raise
+        except MailmanConnectionError:
+            raise MailmanApiError
 
     def delete(self):
         """Not implemented since the objects returned from the API
@@ -104,6 +113,8 @@
             objects = getattr(self.client, self.resource_name_plural)
         except AttributeError:
             raise MailmanApiError
+        except MailmanConnectionError, e:
+            raise MailmanApiError(e)
         if only_public:
             public = []
             for obj in objects:
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html
index 446deba..c6a30d5 100644
--- a/src/postorius/templates/postorius/errors/generic.html
+++ b/src/postorius/templates/postorius/errors/generic.html
@@ -1,10 +1,8 @@
 {% extends "postorius/base.html" %}
 {% load i18n %}
 
-{% block header %}
-    <div class="mm_box mm_clear">
-        <div class="mm_boxHeader">{% trans "Error-Site" %}</div>
-        {% if error %}<p id="error">{{ error }}</p> {% endif %}
-        {% if message %}<p id="message">{{ message }}</p> {% endif %}
-    </div>
+{% block main %}
+    <h1>{% trans 'Something went wrong' %}</h1>
+
+    {% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %}
 {% endblock %}