diff --git a/lib/util/fs.js b/lib/util/fs.js
index e122d566e7e..72831311134 100644
--- a/lib/util/fs.js
+++ b/lib/util/fs.js
@@ -141,7 +141,7 @@ const mkdirp = (fs, p, callback) => {
 					});
 				});
 				return;
-			} else if (err.code === "EEXIST") {
+			} else if (err.code === "EEXIST" || err.code === "EISDIR") {
 				callback();
 				return;
 			}