diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 198fffa48..526e39798 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -476,7 +476,7 @@ class DomainApplication(TimeStampedModel):
         try:
             send_templated_email(
                 "emails/submission_confirmation.txt",
-                "emails/submission_confirmation.subject.txt",
+                "emails/submission_confirmation_subject.txt",
                 self.submitter.email,
                 context={"id": self.id, "domain_name": self.requested_domain.name},
             )
diff --git a/src/registrar/templates/domain_users.html b/src/registrar/templates/domain_users.html
index 8f114e48d..f842cff6c 100644
--- a/src/registrar/templates/domain_users.html
+++ b/src/registrar/templates/domain_users.html
@@ -38,7 +38,7 @@
     </svg><span class="margin-left-05">Add another user</span>
   </a>
 
-  {% if domain.invitations.all %}
+  {% if domain.invitations.exists %}
   <h2>Invitations</h2>
   <table class="usa-table usa-table--borderless usa-table--stacked dotgov-table--stacked dotgov-table">
       <caption class="sr-only">Domain invitations</caption>
diff --git a/src/registrar/templates/emails/domain_invitation.subject.txt b/src/registrar/templates/emails/domain_invitation_subject.txt
similarity index 100%
rename from src/registrar/templates/emails/domain_invitation.subject.txt
rename to src/registrar/templates/emails/domain_invitation_subject.txt
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index dcf864cbc..870b6a676 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -1,5 +1,7 @@
 """View for a single Domain."""
 
+import logging
+
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
 from django.db import IntegrityError
@@ -15,6 +17,9 @@ from ..utility.email import send_templated_email, EmailSendingError
 from .utility import DomainPermission
 
 
+logger = logging.getLogger(__name__)
+
+
 class DomainView(DomainPermission, DetailView):
 
     """Domain detail overview page."""
@@ -79,7 +84,7 @@ class DomainAddUserView(DomainPermission, FormMixin, DetailView):
             try:
                 send_templated_email(
                     "emails/domain_invitation.txt",
-                    "emails/domain_invitation.subject.txt",
+                    "emails/domain_invitation_subject.txt",
                     to_address=email_address,
                     context={
                         "domain_url": self._domain_abs_url(),
@@ -88,6 +93,8 @@ class DomainAddUserView(DomainPermission, FormMixin, DetailView):
                 )
             except EmailSendingError:
                 messages.warning(self.request, "Could not send email invitation.")
+                logger.warn("Could not sent email invitation to %s for domain %s",
+                            email_address, self.object, exc_info=True)
             else:
                 messages.success(
                     self.request, f"Invited {email_address} to this domain."