diff --git a/hosting/templates/hosting/invoice_detail.html b/hosting/templates/hosting/invoice_detail.html
index 9c300b3f..80226123 100644
--- a/hosting/templates/hosting/invoice_detail.html
+++ b/hosting/templates/hosting/invoice_detail.html
@@ -139,8 +139,7 @@
                         <p>
                             <small>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%)
                             </small>
-                            <strong class="pull-right">{{vm.vat|floatformat:2|intcomma}}
-                                CHF</strong>
+                            <strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong>
                         </p>
                         {% endif %}
                         {% if vm.discount.amount > 0 %}
@@ -159,8 +158,7 @@
                 <div class="col-sm-6">
                     <p class="total-price">
                         <strong>{% trans "Total" %} </strong>
-                        <strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %}
-                            CHF</strong>
+                        <strong class="pull-right">{{total_in_chf}} CHF</strong>
                     </p>
                 </div>
             </div>
diff --git a/hosting/views.py b/hosting/views.py
index 34e720f6..af01ae86 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -1173,7 +1173,9 @@ class InvoiceDetailView(LoginRequiredMixin, DetailView):
     def get_object(self, queryset=None):
         invoice_id = self.kwargs.get('invoice_id')
         try:
-            invoice_obj = MonthlyHostingBill.objects.get(invoice_number=invoice_id)
+            invoice_obj = MonthlyHostingBill.objects.get(
+                invoice_number=invoice_id
+            )
             logger.debug("Found MHB for id {invoice_id}".format(
                 invoice_id=invoice_id
             ))
@@ -1184,7 +1186,7 @@ class InvoiceDetailView(LoginRequiredMixin, DetailView):
             else:
                 logger.error("User does not have permission to access")
                 invoice_obj = None
-        except MonthlyHostingBill.DoesNotExist:
+        except MonthlyHostingBill.DoesNotExist as dne:
             logger.debug("MHB not found for id {invoice_id}".format(
                 invoice_id=invoice_id
             ))