diff --git a/lib/persistentqueue/persistentqueue.go b/lib/persistentqueue/persistentqueue.go
index 2c2c853b31..4ca255207f 100644
--- a/lib/persistentqueue/persistentqueue.go
+++ b/lib/persistentqueue/persistentqueue.go
@@ -204,7 +204,11 @@ func tryOpeningQueue(path, name string, chunkFileSize, maxBlockSize, maxPendingB
 		// path contents is broken or missing. Re-create it from scratch.
 		fs.MustClose(q.flockF)
 		fs.RemoveDirContents(path)
-		q.flockF = fs.MustCreateFlockFile(path)
+		flockF, err := fs.CreateFlockFile(path)
+		if err != nil {
+			logger.Panicf("FATAL: cannot create flock file: %s", err)
+		}
+		q.flockF = flockF
 		mi.Reset()
 		mi.Name = q.name
 		if err := mi.WriteToFile(metainfoPath); err != nil {