diff --git a/application/modules/admin/controllers/admin/Emails.php b/application/modules/admin/controllers/admin/Emails.php
index 9bc585e04..5b619b919 100644
--- a/application/modules/admin/controllers/admin/Emails.php
+++ b/application/modules/admin/controllers/admin/Emails.php
@@ -143,7 +143,15 @@ public function treatAction()
                 ->to(['action' => 'treat', 'key' => $this->getRequest()->getParam('key'), 'type' => $this->getRequest()->getParam('type'), 'locale' => $this->getRequest()->getParam('locale')]);
         }
 
-        $this->getView()->set('moduleMapper', $moduleMapper)
-            ->set('emailContent', $emailsMapper->getEmail($this->getRequest()->getParam('key'), $this->getRequest()->getParam('type'), $locale));
+        $emailContent = $emailsMapper->getEmail($this->getRequest()->getParam('key'), $this->getRequest()->getParam('type'), $locale);
+
+        if (!$emailContent) {
+            $this->redirect()
+                ->withMessage('emailTemplateNotFound', 'danger')
+                ->to(['action' => 'index']);
+        }
+
+        $this->getView()->set('modules', $moduleMapper->getModulesByKey($this->getRequest()->getParam('key'), $this->getTranslator()->getLocale()))
+            ->set('emailContent', $emailContent);
     }
 }
diff --git a/application/modules/admin/translations/de.php b/application/modules/admin/translations/de.php
index cc2eba5e8..891f4570d 100644
--- a/application/modules/admin/translations/de.php
+++ b/application/modules/admin/translations/de.php
@@ -417,6 +417,7 @@
     'emailDesc' => 'Beschreibung',
     'emailLocale' => 'Sprache',
     'emailText' => 'Text',
+    'emailTemplateNotFound' => 'E-Mail-Vorlage nicht gefunden.',
 
     'menuMail' => 'Mail Einstellungen',
     'smtpModeEnabledDescription' => 'Versende E-Mails über einen SMTP-Server.',
diff --git a/application/modules/admin/translations/en.php b/application/modules/admin/translations/en.php
index ccbb175cf..8246e23b5 100644
--- a/application/modules/admin/translations/en.php
+++ b/application/modules/admin/translations/en.php
@@ -417,6 +417,7 @@
     'emailDesc' => 'Description',
     'emailLocale' => 'Language',
     'emailText' => 'Text',
+    'emailTemplateNotFound' => 'E-Mail template not found.',
 
     'menuMail' => 'Mail settings',
     'smtpModeEnabledDescription' => 'Sending emails through a SMTP server.',
diff --git a/application/modules/admin/views/admin/emails/index.php b/application/modules/admin/views/admin/emails/index.php
index 039f67168..5b137d767 100644
--- a/application/modules/admin/views/admin/emails/index.php
+++ b/application/modules/admin/views/admin/emails/index.php
@@ -22,7 +22,7 @@
                                 <?php continue; ?>
                             <?php endif; ?>
 
-                            <img src="<?=$this->getStaticUrl('img/lang/' . $key . '.png') ?>">
+                            <img src="<?=$this->getStaticUrl('img/lang/' . $key . '.png') ?>" alt="<?=$key ?>">
                         <?php endforeach; ?>
                     </th>
                 <?php endif; ?>
@@ -34,7 +34,7 @@
                 <?php $emails = $emailsMapper->getEmailsByKey($modules->getModuleKey(), $this->getTranslator()->getLocale()); ?>
                 <tr>
                     <td <?=($this->get('multilingual')) ? 'colspan=2' : '' ?>>
-                        <b><?=$module->getName() ?></b>
+                        <b><?=$module ? $module->getName() : $this->escape($modules->getModuleKey()) ?></b>
                     </td>
                 </tr>
                 <?php foreach ($emails as $email): ?>
diff --git a/application/modules/admin/views/admin/emails/treat.php b/application/modules/admin/views/admin/emails/treat.php
index f94223d27..30febe13b 100644
--- a/application/modules/admin/views/admin/emails/treat.php
+++ b/application/modules/admin/views/admin/emails/treat.php
@@ -1,7 +1,7 @@
 <?php
 $email = $this->get('emailContent');
-$moduleMapper = $this->get('moduleMapper');
-$module = $moduleMapper->getModulesByKey($this->getRequest()->getParam('key'), $this->getTranslator()->getLocale());
+$module = $this->get('module');
+$moduleName = ($module) ? $module->getName() : $this->escape($this->getRequest()->getParam('key'));
 ?>
 
 <h1><?=$this->getTrans('edit') ?></h1>
@@ -12,7 +12,7 @@
             <?=$this->getTrans('emailModule') ?>
         </label>
         <div class="col-xl-10">
-            <?=$module->getName() ?>
+            <?=$moduleName ?>
         </div>
     </div>
     <div class="row mb-3">