diff --git a/ext/custom-addons/dp_reports_account/models/account_invoice.py b/ext/custom-addons/dp_reports_account/models/account_invoice.py
index 9485637c..89d44639 100644
--- a/ext/custom-addons/dp_reports_account/models/account_invoice.py
+++ b/ext/custom-addons/dp_reports_account/models/account_invoice.py
@@ -14,7 +14,7 @@ class AccountInvoice(models.Model):
 
         self.ensure_one()
         res = [[]]
-        for category, lines in groupby(self.invoice_line_ids.sorted(key=lambda s: s.layout_category_id.name), lambda l: l.layout_category_id):
+        for category, lines in groupby(self.invoice_line_ids.sorted(key=lambda s: s.layout_category_id.name or ''), lambda l: l.layout_category_id):
             # If last added category induced a pagebreak, this one will be on a new page
             if res[-1] and res[-1][-1]['pagebreak']:
                 res.append([])
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 4c5d1f98..cddce836 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -201,15 +201,15 @@
                                                 <br/>
                                             </span>
                                             <span t-if="shorttext">
-                                                <span>
+                                                <span t-if="invoice_line.lot_id and invoice_line.lot_id.short_text">
                                                     <strong>Kurztext:</strong>
-                                                    <span t-if="invoice_line.lot_id.short_text" t-field="invoice_line.lot_id.short_text"/>
+                                                    <span t-field="invoice_line.lot_id.short_text"/>
                                                 </span>
-                                                <span>
-                                                    <span t-if="not invoice_line.lot_id.short_text" t-field="invoice_line.name"/>
+                                                <span t-else="">
+                                                    <span t-field="invoice_line.name"/>
                                                 </span>
                                             </span>
-                                            <span t-if="not shorttext">
+                                            <span t-else="">
                                                 <span t-field="invoice_line.name"/>
                                             </span>
                                             <span t-if="invoice_line.product_id.tracking=='serial'">