diff --git a/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionAccessor.cs b/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionAccessor.cs
index 6da70b9..0b9add4 100644
--- a/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionAccessor.cs
+++ b/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionAccessor.cs
@@ -34,7 +34,7 @@ namespace ZeroLevel.Services.PartitionStorage
         }
 
         #region API methods
-        public int CountDataFiles() => Directory.GetFiles(_catalog)?.Length ?? 0;
+        public int CountDataFiles() => Directory.Exists(_catalog) ? (Directory.GetFiles(_catalog)?.Length ?? 0) : 0;
         public string GetCatalogPath() => _catalog;
         public void DropData() => FSUtils.CleanAndTestFolder(_catalog);
         public StorePartitionKeyValueSearchResult<TKey, TValue> Find(TKey key)
diff --git a/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionBuilder.cs b/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionBuilder.cs
index 204ff12..182a8ff 100644
--- a/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionBuilder.cs
+++ b/ZeroLevel/Services/PartitionStorage/Partition/StorePartitionBuilder.cs
@@ -46,7 +46,7 @@ namespace ZeroLevel.Services.PartitionStorage
         }
 
         #region API methods
-        public int CountDataFiles() => Directory.GetFiles(_catalog)?.Length ?? 0;
+        public int CountDataFiles() => Directory.Exists(_catalog) ? (Directory.GetFiles(_catalog)?.Length ?? 0) : 0;
         public string GetCatalogPath() => _catalog;
         public void DropData() => FSUtils.CleanAndTestFolder(_catalog);
         public void Store(TKey key, TInput value)
diff --git a/ZeroLevel/ZeroLevel.csproj b/ZeroLevel/ZeroLevel.csproj
index c34cff3..b673b0a 100644
--- a/ZeroLevel/ZeroLevel.csproj
+++ b/ZeroLevel/ZeroLevel.csproj
@@ -6,7 +6,7 @@
 </Description>
     <Authors>ogoun</Authors>
     <Company>ogoun</Company>
-    <AssemblyVersion>3.3.7.8</AssemblyVersion>
+    <AssemblyVersion>3.3.7.9</AssemblyVersion>
     <PackageReleaseNotes>PartitionStorage optimizations</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/ogoun/Zero/wiki</PackageProjectUrl>
     <Copyright>Copyright Ogoun 2022</Copyright>
@@ -14,8 +14,8 @@
     <PackageIconUrl></PackageIconUrl>
     <RepositoryUrl>https://github.com/ogoun/Zero</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>3.3.7.8</Version>
-    <FileVersion>3.3.7.8</FileVersion>
+    <Version>3.3.7.9</Version>
+    <FileVersion>3.3.7.9</FileVersion>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <PackageIcon>zero.png</PackageIcon>
     <DebugType>full</DebugType>