diff --git a/taiga/base/management/commands/test_emails.py b/taiga/base/management/commands/test_emails.py
index fbe7a7dd..6b7f8bf5 100644
--- a/taiga/base/management/commands/test_emails.py
+++ b/taiga/base/management/commands/test_emails.py
@@ -94,6 +94,11 @@ class Command(BaseCommand):
         }
         email = mbuilder.export_error(test_email, context)
         email.send()
+        context = {
+            "user": User.objects.all().order_by("?").first(),
+            "error_subject": "Error importing project dump",
+            "error_message": "Error importing project dump",
+        }
         email = mbuilder.import_error(test_email, context)
         email.send()
 
diff --git a/taiga/export_import/templates/emails/export_error-body-html.jinja b/taiga/export_import/templates/emails/export_error-body-html.jinja
index 670fcc13..aacc09c0 100644
--- a/taiga/export_import/templates/emails/export_error-body-html.jinja
+++ b/taiga/export_import/templates/emails/export_error-body-html.jinja
@@ -7,7 +7,7 @@
              project=project.name|safe %}
     <h1>{{ error_message }}</h1>
     <p>Hello {{ user }},</p>
-    <p>Your project {{ project }} has not been exported correctly </p>
+    <p>Your project {{ project }} has not been exported correctly.</p>
     <p>The Taiga system administrators have been informed.<br/> Please, try it again or contact with the support team at
        <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
     <p><small>The Taiga Team</small></p>
diff --git a/taiga/export_import/templates/emails/export_error-body-text.jinja b/taiga/export_import/templates/emails/export_error-body-text.jinja
index bf84a194..018ced94 100644
--- a/taiga/export_import/templates/emails/export_error-body-text.jinja
+++ b/taiga/export_import/templates/emails/export_error-body-text.jinja
@@ -5,6 +5,9 @@
 Hello {{ user }},
 
 {{ error_message }}
+Your project {{ project }} has not been exported correctly.
+
+The Taiga system administrators have been informed.
 
 Please, try it again or contact with the support team at {{ support_email }}
 
diff --git a/taiga/export_import/templates/emails/import_error-body-html.jinja b/taiga/export_import/templates/emails/import_error-body-html.jinja
index 00275f86..9f178f2a 100644
--- a/taiga/export_import/templates/emails/import_error-body-html.jinja
+++ b/taiga/export_import/templates/emails/import_error-body-html.jinja
@@ -6,7 +6,8 @@
              support_email=sr("support.email") %}
     <h1>{{ error_message }}</h1>
     <p>Hello {{ user }},</p>
-    <p>Please, try it again or contact with the support team at
+    <p>Your project has not been importer correctly.</p>
+    <p>The Taiga system administrators have been informed.<br/> Please, try it again or contact with the support team at
        <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
     <p><small>The Taiga Team</small></p>
     {% endtrans %}
diff --git a/taiga/export_import/templates/emails/import_error-body-text.jinja b/taiga/export_import/templates/emails/import_error-body-text.jinja
index bdaab4e2..affc8dc9 100644
--- a/taiga/export_import/templates/emails/import_error-body-text.jinja
+++ b/taiga/export_import/templates/emails/import_error-body-text.jinja
@@ -5,6 +5,10 @@ Hello {{ user }},
 
 {{ error_message }}
 
+Your project has not been importer correctly.
+
+The Taiga system administrators have been informed.
+
 Please, try it again or contact with the support team at {{ support_email }}
 
 ---
diff --git a/taiga/projects/templates/emails/membership_invitation-body-html.jinja b/taiga/projects/templates/emails/membership_invitation-body-html.jinja
index c5a31754..a3efbc1f 100644
--- a/taiga/projects/templates/emails/membership_invitation-body-html.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-body-html.jinja
@@ -1,7 +1,15 @@
 {% extends "emails/hero-body-html.jinja" %}
 
+{% if membership.invited_by %}
+    {% set sender_full_name=membership.invited_by.get_full_name() %}
+{% else %}
+    {% set sender_full_name=_("someone") %}
+{% endif %}
+
+
 {% block body %}
-    {% trans full_name=membership.invited_by.get_full_name(), project=membership.project %}
+    {% trans full_name=sender_full_name,
+             project=membership.project %}
     <h2>You have been invited to Taiga!</h2>
 <p>Hi! {{ full_name }} has sent you an invitation to join project <em>{{ project }}</em> in Taiga.</br> Taiga is a Free, open Source Agile Project Management Tool.</p>
     {% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_invitation-body-text.jinja b/taiga/projects/templates/emails/membership_invitation-body-text.jinja
index d2763684..f8ed38e9 100644
--- a/taiga/projects/templates/emails/membership_invitation-body-text.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-body-text.jinja
@@ -1,4 +1,9 @@
-{% trans full_name=membership.invited_by.get_full_name(),
+{% if membership.invited_by %}
+    {% set sender_full_name=membership.invited_by.get_full_name() %}
+{% else %}
+    {% set sender_full_name=_("someone") %}
+{% endif %}
+{% trans full_name=sender_full_name,
          project=membership.project %}
 You, or someone you know, has invited you to Taiga