diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
index 2335b8d1b3..ed28ec09b8 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
@@ -88,7 +88,9 @@ public class FileUtil {
 
   public static Path mkdirsOrDie(Path p, String errMsg) {
     try {
-      Files.createDirectories(p);
+      if (!Files.isDirectory(p)) {
+        Files.createDirectories(p);
+      }
       return p;
     } catch (IOException e) {
       throw new Die(errMsg + ": " + p, e);