diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 92a5682..b01c69e 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -456,7 +456,9 @@
   get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
       // TODO Don't use Option.get
-      html.editgroup(getAccountByUserName(groupName, true).get, getGroupMembers(groupName), flash.get("info"))
+      getAccountByUserName(groupName, true).map { account =>
+        html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+      } getOrElse NotFound()
     }
   })