diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
index 6224c173..e7083ce5 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
@@ -215,7 +215,8 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 
 	private Git copyRepository() throws IOException, GitAPIException {
 		deleteBaseDirIfExists();
-		Assert.state(getBasedir().mkdirs(), "Could not create basedir: " + getBasedir());
+		getBasedir().mkdirs();
+		Assert.state(getBasedir().exists(), "Could not create basedir: " + getBasedir());
 		if (getUri().startsWith(FILE_URI_PREFIX)) {
 			return copyFromLocalRepository();
 		}