diff --git a/docs/changelog.rst b/docs/changelog.rst
index 883156e..a8ef494 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :release:`0.12.1 <2020-04-13>`
+* :bug:`7` fix handling of undefined mail domains in customer hosting package
+  detail template
+
 * :release:`0.12.0 <2020-04-10>`
 * :support:`-` add architecture diagramm for documentation
 * :support:`-` drop environment specific settings
diff --git a/gnuviechadmin/gnuviechadmin/__init__.py b/gnuviechadmin/gnuviechadmin/__init__.py
index 4f7caa1..1fd249f 100644
--- a/gnuviechadmin/gnuviechadmin/__init__.py
+++ b/gnuviechadmin/gnuviechadmin/__init__.py
@@ -1,4 +1,4 @@
 # import celery_app to initialize it
 from gnuviechadmin.celery import app as celery_app  # NOQA
 
-__version__ = '0.12.0'
+__version__ = '0.12.1'
diff --git a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
index 0818016..c135d59 100644
--- a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
+++ b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
@@ -116,9 +116,11 @@
             <td class="text-info">{% trans "None" %}</td>
             {% endif %}
             <td>
-              {% with maildomain=domain.domain.maildomain %}
-              <a href="{% url 'add_mailaddress' package=hostingpackage.id domain=maildomain.domain %}" title="{% trans "Add mail address" %}"><i class="fa fa-envelope"></i><span class="sr-only"> {% trans "Add mail address" %}</span></a>
-              {% endwith %}
+              {% if domain.domain.maildomain %}
+                 {% with maildomain=domain.domain.maildomain %}
+                   <a href="{% url 'add_mailaddress' package=hostingpackage.id domain=maildomain.domain %}" title="{% trans "Add mail address" %}"><i class="fa fa-envelope"></i><span class="sr-only"> {% trans "Add mail address" %}</span></a>
+                 {% endwith %}
+              {% endif %}
               {% with hostingdomain=domain.domain %}
               <a href="{% url 'add_website' package=hostingpackage.id domain=hostingdomain.domain %}" title="{% trans "Add website" %}"><i class="glyphicon glyphicon-globe"></i><span class="sr-only"> {% trans "Add website" %}</span></a>
               {% endwith %}