diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 78446897b7..4d62320c09 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -163,7 +163,7 @@ class parse_message
 			do
 			{
 				$match[] = "#(?<=.\W|\W.|^\W)" . preg_quote($row['code'], '#') . "(?=.\W|\W.|\W$)#";
-				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILE_PATH}/' . $row['smile_url'] . '" alt="' . $row['smile_url'] . '" border="0" alt="' . $row['emoticon'] . '" title="' . $row['emoticon'] . '" /><!-- s' . $row['code'] . ' -->';
+				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILE_PATH}/' . $row['smile_url'] . '" border="0" alt="' . $row['emoticon'] . '" title="' . $row['emoticon'] . '" /><!-- s' . $row['code'] . ' -->';
 			}
 			while ($row = $db->sql_fetchrow($result));
 
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 9f1fe1b57b..3060c31510 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -99,7 +99,7 @@ class Template {
 		{
 			if (empty($filename))
 			{
-				message_die(ERROR, "Template error - Empty filename specified for $handle");
+				trigger_error("Template error - Empty filename specified for $handle", E_USER_ERROR);
 			}
 
 			$this->filename[$handle] = $filename;