diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
index 0ce77a1..a308469 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
@@ -111,9 +111,7 @@
       return;
     }
 
-    final RevWalk rw = new RevWalk(git);
-
-    try {
+    try (final RevWalk rw = new RevWalk(git)) {
       final ReviewDb reviewDb = schemaFactory.open();
       try {
         Change.Id changeId = new Change.Id(Integer.parseInt(e.change.number));
@@ -180,7 +178,6 @@
     } catch (OrmException|IOException x) {
       log.error(x.getMessage(), x);
     } finally {
-      rw.close();
       git.close();
     }
   }