2 files changed, 9 insertions, 8 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs
index c7e4c97..e4581b9 100644
--- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs
+++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs
@@ -46,7 +46,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
         protected override Task<bool> IsEmpty(string path)
         {
             var x = new DirectoryInfo(path);
-            return Task.FromResult(x.Exists && x.EnumerateFileSystemInfos().Any());
+            return Task.FromResult(x.Exists && !x.EnumerateFileSystemInfos().Any());
         }
 
         protected override async Task WriteFile(string path, string content)
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs
index 9a4e748..b32127c 100644
--- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs
+++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs
@@ -29,15 +29,16 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
         {
             var args = _arguments.GetArguments<FileSystemArguments>();
             var ret = new FileSystemOptions(BaseDefault(target));
-            if (target.IIS && _iisClient.HasWebSites)
+            if (string.IsNullOrEmpty(ret.Path))
             {
-
-                if (args?.ValidationSiteId != null)
+                if (target.IIS && _iisClient.HasWebSites)
                 {
-                    // Throws exception when not found
-                    var site = _iisClient.GetWebSite(args.ValidationSiteId.Value);
-                    ret.Path = site.Path;
-                    ret.SiteId = args.ValidationSiteId.Value;
+                    if (args?.ValidationSiteId != null)
+                    {
+                        // Throws exception when not found
+                        _iisClient.GetWebSite(args.ValidationSiteId.Value);
+                        ret.SiteId = args.ValidationSiteId.Value;
+                    }
                 }
             }
             return ret;