diff --git a/src/main/java/com/google/gerrit/git/PushQueue.java b/src/main/java/com/google/gerrit/git/PushQueue.java
index cd6b733ebc..d9cc77c91d 100644
--- a/src/main/java/com/google/gerrit/git/PushQueue.java
+++ b/src/main/java/com/google/gerrit/git/PushQueue.java
@@ -158,7 +158,11 @@ public class PushQueue {
       log.error("Cannot replicate to " + op.uri, e);
       return;
     } finally {
-      tn.close();
+      try {
+        tn.close();
+      } catch (Throwable e2){
+        log.warn("Unexpected error while closing " + op.uri, e2);
+      }
     }
 
     for (final RemoteRefUpdate u : res.getRemoteUpdates()) {