diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java
index 560b80756..a9e05c92a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java
@@ -168,7 +168,12 @@ public void execute(RevWalk walk, ProgressMonitor monitor,
 				if (locks == null) {
 					return;
 				}
-				refdb.pack(locks);
+				try {
+					refdb.pack(locks);
+				} catch (LockFailedException e) {
+					lockFailure(pending.get(0), pending);
+					return;
+				}
 			}
 
 			LockFile packedRefsLock = refdb.lockPackedRefs();