diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
index 437c6ea..2e63b17 100644
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -683,7 +683,7 @@
           headName, loginAccount.fullName, loginAccount.mailAddress, message)
 
         inserter.flush()
-        inserter.release()
+        inserter.close()
 
         // update refs
         val refUpdate = git.getRepository.updateRef(headName)
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
index 98c7ea4..b032369 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -169,7 +169,7 @@
           ))
 
         } catch {
-          case e: Exception => {
+          case e: Throwable => {
             logger.error(s"Error during plugin initialization", e)
           }
         }
diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala
index 4b6cc3a..6614fd4 100644
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -164,7 +164,7 @@
       val inserter = repository.newObjectInserter
       val mergeCommitId = inserter.insert(mergeCommit)
       inserter.flush()
-      inserter.release()
+      inserter.close()
       mergeCommitId
     }
     private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
diff --git a/src/main/scala/gitbucket/core/service/RepositorySearchService.scala b/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
index 84e94e4..3d9bd8a 100644
--- a/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
@@ -79,8 +79,8 @@
         }
       }
     }
-    treeWalk.release
-    revWalk.release
+    treeWalk.close()
+    revWalk.close()
 
     list.toList
   }
diff --git a/src/main/scala/gitbucket/core/util/ControlUtil.scala b/src/main/scala/gitbucket/core/util/ControlUtil.scala
index 268e692..a323c42 100644
--- a/src/main/scala/gitbucket/core/util/ControlUtil.scala
+++ b/src/main/scala/gitbucket/core/util/ControlUtil.scala
@@ -1,8 +1,6 @@
 package gitbucket.core.util
 
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.treewalk.TreeWalk
 import scala.util.control.Exception._
 import scala.language.reflectiveCalls
 
@@ -31,12 +29,6 @@
       git2.getRepository.close()
     }
 
-  def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
-    try f(revWalk) finally revWalk.release()
-
-  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
-    try f(treeWalk) finally treeWalk.release()
-
   def ignore[T](f: => Unit): Unit = try {
     f
   } catch {
diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index f4c35a8..565018b 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -688,7 +688,7 @@
 
     val newHeadId = inserter.insert(newCommit)
     inserter.flush()
-    inserter.release()
+    inserter.close()
 
     val refUpdate = git.getRepository.updateRef(ref)
     refUpdate.setNewObjectId(newHeadId)