diff --git a/internal/context/context.go b/internal/context/context.go
index 44bb6eedd..b4809ec79 100644
--- a/internal/context/context.go
+++ b/internal/context/context.go
@@ -46,9 +46,14 @@ type Context struct {
 	Org  *Organization
 }
 
-// Title sets "Title" field in template data.
+// RawTitle sets the "Title" field in template data.
+func (c *Context) RawTitle(title string) {
+	c.Data["Title"] = title
+}
+
+// Title localizes the "Title" field in template data.
 func (c *Context) Title(locale string) {
-	c.Data["Title"] = c.Tr(locale)
+	c.RawTitle(c.Tr(locale))
 }
 
 // PageIs sets "PageIsxxx" field in template data.
diff --git a/internal/gitutil/diff_test.go b/internal/gitutil/diff_test.go
index b651b088e..65c5df65e 100644
--- a/internal/gitutil/diff_test.go
+++ b/internal/gitutil/diff_test.go
@@ -28,7 +28,7 @@ func Test_diffsToHTML(t *testing.T) {
 				{Type: dmp.DiffEqual, Text: " biz"},
 			},
 			lineType: git.DiffLineAdd,
-			expHTML:  template.HTML(`+ foo <span class="added-code">bar</span> biz`),
+			expHTML:  template.HTML(`+foo <span class="added-code">bar</span> biz`),
 		},
 		{
 			diffs: []dmp.Diff{
@@ -38,7 +38,7 @@ func Test_diffsToHTML(t *testing.T) {
 				{Type: dmp.DiffEqual, Text: " biz"},
 			},
 			lineType: git.DiffLineDelete,
-			expHTML:  template.HTML(`- foo <span class="removed-code">bar</span> biz`),
+			expHTML:  template.HTML(`-foo <span class="removed-code">bar</span> biz`),
 		},
 	}
 	for _, test := range tests {
diff --git a/internal/route/repo/commit.go b/internal/route/repo/commit.go
index e7fa57783..7b11e89a0 100644
--- a/internal/route/repo/commit.go
+++ b/internal/route/repo/commit.go
@@ -119,7 +119,6 @@ func Diff(c *context.Context) {
 
 	commit, err := c.Repo.GitRepo.CatFileCommit(commitID)
 	if err != nil {
-		// TODO: Move checker to gitutil package
 		c.NotFoundOrServerError("get commit by ID", gitutil.IsErrRevisionNotExist, err)
 		return
 	}
@@ -135,11 +134,11 @@ func Diff(c *context.Context) {
 	parents := make([]string, commit.ParentsCount())
 	for i := 0; i < commit.ParentsCount(); i++ {
 		sha, err := commit.ParentID(i)
-		parents[i] = sha.String()
 		if err != nil {
 			c.NotFound()
 			return
 		}
+		parents[i] = sha.String()
 	}
 
 	setEditorconfigIfExists(c)
@@ -147,7 +146,7 @@ func Diff(c *context.Context) {
 		return
 	}
 
-	c.Title(commit.Summary() + " · " + tool.ShortSHA1(commitID))
+	c.RawTitle(commit.Summary() + " · " + tool.ShortSHA1(commitID))
 	c.Data["CommitID"] = commitID
 	c.Data["IsSplitStyle"] = c.Query("style") == "split"
 	c.Data["Username"] = userName