diff --git a/server/.golangci.yml b/server/.golangci.yml
index a7ddd1722b..683138e6e4 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -119,7 +119,6 @@ issues:
         channels/jobs/helper_test.go|\
         channels/jobs/hosted_purchase_screening/worker.go|\
         channels/jobs/jobs.go|\
-        channels/manualtesting/manual_testing.go|\
         channels/store/localcachelayer/channel_layer.go|\
         channels/store/localcachelayer/channel_layer_test.go|\
         channels/store/localcachelayer/emoji_layer.go|\
diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go
index 3021a58137..7490917496 100644
--- a/server/channels/manualtesting/manual_testing.go
+++ b/server/channels/manualtesting/manual_testing.go
@@ -48,7 +48,10 @@ func ManualTest(c *web.Context, w http.ResponseWriter, r *http.Request) {
 	uid, ok := params["uid"]
 	if ok {
 		hasher := fnv.New32a()
-		hasher.Write([]byte(uid[0] + strconv.Itoa(int(time.Now().UTC().UnixNano()))))
+		_, writeErr := hasher.Write([]byte(uid[0] + strconv.Itoa(int(time.Now().UTC().UnixNano()))))
+		if writeErr != nil {
+			c.Logger.Error("Failed to write to hasher", mlog.Err(writeErr))
+		}
 		hash := hasher.Sum32()
 		rand.Seed(int64(hash))
 	} else {
@@ -115,8 +118,15 @@ func ManualTest(c *web.Context, w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		c.App.Srv().Store().User().VerifyEmail(user.Id, user.Email)
-		c.App.Srv().Store().Team().SaveMember(c.AppContext, &model.TeamMember{TeamId: teamID, UserId: user.Id}, *c.App.Config().TeamSettings.MaxUsersPerTeam)
+		if _, verifyErr := c.App.Srv().Store().User().VerifyEmail(user.Id, user.Email); verifyErr != nil {
+			c.Err = model.NewAppError("manualTest", "app.user.verify_email.app_error", nil, "", http.StatusInternalServerError).Wrap(verifyErr)
+			return
+		}
+
+		if _, saveErr := c.App.Srv().Store().Team().SaveMember(c.AppContext, &model.TeamMember{TeamId: teamID, UserId: user.Id}, *c.App.Config().TeamSettings.MaxUsersPerTeam); saveErr != nil {
+			c.Err = model.NewAppError("manualTest", "app.team.save_member.save.app_error", nil, "", http.StatusInternalServerError).Wrap(saveErr)
+			return
+		}
 
 		userID = user.Id