diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 5d72a33..2283c17 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -471,7 +471,14 @@ def getAssignableUserNames(owner: String, repository: String)(implicit s: Session): List[String] = { (getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)) ::: - (if (getAccountByUserName(owner).get.isGroupAccount) getGroupMembers(owner).map(_.userName) else List(owner))).distinct.sorted + (getAccountByUserName(owner) match { + case Some(x) if x.isGroupAccount => + getGroupMembers(owner).map(_.userName) + case Some(_) => + List(owner) + case None => + Nil + })).distinct.sorted } }