diff --git a/addons/account/account.py b/addons/account/account.py
index b4a14684a27..b6dd4bfb11b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1308,7 +1308,7 @@ class account_tax(osv.osv):
             # we compute the amount for the current tax object and append it to the result
 
             data = {'id':tax.id,
-                            'name':tax.name,
+                            'name':tax.description and tax.description + " - " + tax.name or tax.name,
                             'account_collected_id':tax.account_collected_id.id,
                             'account_paid_id':tax.account_paid_id.id,
                             'base_code_id': tax.base_code_id.id,
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index b2a65b73f33..902a9db3e06 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -366,7 +366,7 @@
             <tr>
               <td><para style="terp_default_Centre_8">[[ t.name ]] </para></td>
               <td><para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para></td>
-              <td><para style="terp_default_Right_8">[[  t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
+              <td><para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
             </tr>
           </blockTable>
         </td>