diff --git a/models/issue.go b/models/issue.go
index 3fb09603c543..0a08a97fdd35 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -721,8 +721,7 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) {
 		OldTitle: oldTitle,
 		NewTitle: issue.Title,
 	}
-	_, err = createCommentWithNoAction(sess, opts)
-	if err != nil {
+	if _, err = createCommentWithNoAction(sess, opts); err != nil {
 		return fmt.Errorf("createComment: %v", err)
 	}
 	if err = issue.addCrossReferences(sess, doer, true); err != nil {
@@ -750,8 +749,7 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
 		Issue:     issue,
 		CommitSHA: branchName,
 	}
-	_, err = createCommentWithNoAction(sess, opts)
-	if err != nil {
+	if _, err = createCommentWithNoAction(sess, opts); err != nil {
 		return err
 	}
 
@@ -893,8 +891,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 			OldMilestoneID: 0,
 			MilestoneID:    opts.Issue.MilestoneID,
 		}
-		_, err = createCommentWithNoAction(e, opts)
-		if err != nil {
+		if _, err = createCommentWithNoAction(e, opts); err != nil {
 			return err
 		}
 	}
diff --git a/models/issue_comment.go b/models/issue_comment.go
index 82db69503f55..5843689f1bbb 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -699,8 +699,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
 		Issue:            issue,
 		DependentIssueID: dependentIssue.ID,
 	}
-	_, err = createCommentWithNoAction(e, opts)
-	if err != nil {
+	if _, err = createCommentWithNoAction(e, opts); err != nil {
 		return
 	}
 
@@ -712,10 +711,6 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
 		DependentIssueID: issue.ID,
 	}
 	_, err = createCommentWithNoAction(e, opts)
-	if err != nil {
-		return
-	}
-
 	return
 }
 
diff --git a/models/issue_label.go b/models/issue_label.go
index 16572975bf8e..4318406af71e 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -414,8 +414,7 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (err
 		Label:   label,
 		Content: "1",
 	}
-	_, err = createCommentWithNoAction(e, opts)
-	if err != nil {
+	if _, err = createCommentWithNoAction(e, opts); err != nil {
 		return err
 	}
 
@@ -491,8 +490,7 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (
 		Issue: issue,
 		Label: label,
 	}
-	_, err = createCommentWithNoAction(e, opts)
-	if err != nil {
+	if _, err = createCommentWithNoAction(e, opts); err != nil {
 		return err
 	}
 
diff --git a/models/issue_lock.go b/models/issue_lock.go
index 115654406148..4a2055ce324e 100644
--- a/models/issue_lock.go
+++ b/models/issue_lock.go
@@ -52,8 +52,7 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error {
 		Type:    commentType,
 		Content: opts.Reason,
 	}
-	_, err := createCommentWithNoAction(sess, opt)
-	if err != nil {
+	if _, err := createCommentWithNoAction(sess, opt); err != nil {
 		return err
 	}
 
diff --git a/models/issue_milestone.go b/models/issue_milestone.go
index b179fcf542d1..0b854a8671d4 100644
--- a/models/issue_milestone.go
+++ b/models/issue_milestone.go
@@ -394,8 +394,7 @@ func changeMilestoneAssign(e *xorm.Session, doer *User, issue *Issue, oldMilesto
 			OldMilestoneID: oldMilestoneID,
 			MilestoneID:    issue.MilestoneID,
 		}
-		_, err := createCommentWithNoAction(e, opts)
-		if err != nil {
+		if _, err := createCommentWithNoAction(e, opts); err != nil {
 			return err
 		}
 	}