From 63eaac67a64c77c8a17b429647a3599b84f5e66a Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 8 Mar 2018 07:22:14 -0500
Subject: [PATCH] repo: improve error handling for PR #4803

---
 routes/repo/issue.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/routes/repo/issue.go b/routes/repo/issue.go
index 29fab3af7..41d0df1f1 100644
--- a/routes/repo/issue.go
+++ b/routes/repo/issue.go
@@ -644,9 +644,15 @@ func viewIssue(c *context.Context, isPullList bool) {
 		pull := issue.PullRequest
 		branchProtected := false
 		protectBranch, err := models.GetProtectBranchOfRepoByName(pull.BaseRepoID, pull.HeadBranch)
-		if err == nil {
+		if err != nil {
+			if !errors.IsErrBranchNotExist(err) {
+				c.ServerError("GetProtectBranchOfRepoByName", err)
+				return
+			}
+		} else {
 			branchProtected = protectBranch.Protected
 		}
+
 		c.Data["IsPullBranchDeletable"] = pull.BaseRepoID == pull.HeadRepoID &&
 			c.Repo.IsWriter() && c.Repo.GitRepo.IsBranchExist(pull.HeadBranch) &&
 			!branchProtected