diff --git a/.vs/Roaming.git/FileContentIndex/eb72bb53-b0b2-4f5e-af1f-8a6d82ec0880.vsidx b/.vs/Roaming.git/FileContentIndex/44df2627-f01c-4316-b8d2-cb51ac0760bf.vsidx
similarity index 88%
rename from .vs/Roaming.git/FileContentIndex/eb72bb53-b0b2-4f5e-af1f-8a6d82ec0880.vsidx
rename to .vs/Roaming.git/FileContentIndex/44df2627-f01c-4316-b8d2-cb51ac0760bf.vsidx
index e6331ce..f19c68c 100644
Binary files a/.vs/Roaming.git/FileContentIndex/eb72bb53-b0b2-4f5e-af1f-8a6d82ec0880.vsidx and b/.vs/Roaming.git/FileContentIndex/44df2627-f01c-4316-b8d2-cb51ac0760bf.vsidx differ
diff --git a/.vs/Roaming.git/v17/.suo b/.vs/Roaming.git/v17/.suo
index 0d6ecb4..45f93af 100644
Binary files a/.vs/Roaming.git/v17/.suo and b/.vs/Roaming.git/v17/.suo differ
diff --git a/Roaming/Roaming.cs b/Roaming/Roaming.cs
index d8c8207..48dffff 100644
--- a/Roaming/Roaming.cs
+++ b/Roaming/Roaming.cs
@@ -288,7 +288,14 @@ namespace Eugen.ESystem
         /// <returns>'True' if the sub key exists, otherwise 'false'</returns>
         public bool SubKeyExists()
         {
-            return Directory.Exists(RoamingPath + "\\" + MainKey + "\\" + SubKey);
+            if (String.IsNullOrEmpty(SubKey))
+            {
+                return false;
+            }
+            else
+            {
+                return Directory.Exists(RoamingPath + "\\" + MainKey + "\\" + SubKey);
+            }
         }
 
         /// <summary>
@@ -299,11 +306,11 @@ namespace Eugen.ESystem
         {
             if (SubKeyExists())
             {
-                return Directory.Exists(RoamingPath + "\\" + MainKey + "\\" + SubKey + "\\" + Key);
+                return File.Exists(RoamingPath + "\\" + MainKey + "\\" + SubKey + "\\" + Key);
             }
             else
             {
-                return Directory.Exists(RoamingPath + "\\" + MainKey + "\\" + Key);
+                return File.Exists(RoamingPath + "\\" + MainKey + "\\" + Key);
             }
         }
 
diff --git a/Roaming/bin/Debug/heroaming.dll b/Roaming/bin/Debug/heroaming.dll
index 79f782d..4f549c8 100644
Binary files a/Roaming/bin/Debug/heroaming.dll and b/Roaming/bin/Debug/heroaming.dll differ
diff --git a/Roaming/bin/Debug/heroaming.pdb b/Roaming/bin/Debug/heroaming.pdb
index aeb1c58..d82d952 100644
Binary files a/Roaming/bin/Debug/heroaming.pdb and b/Roaming/bin/Debug/heroaming.pdb differ
diff --git a/Roaming/obj/Debug/heroaming.dll b/Roaming/obj/Debug/heroaming.dll
index 79f782d..4f549c8 100644
Binary files a/Roaming/obj/Debug/heroaming.dll and b/Roaming/obj/Debug/heroaming.dll differ
diff --git a/Roaming/obj/Debug/heroaming.pdb b/Roaming/obj/Debug/heroaming.pdb
index aeb1c58..d82d952 100644
Binary files a/Roaming/obj/Debug/heroaming.pdb and b/Roaming/obj/Debug/heroaming.pdb differ
diff --git a/Test_Roaming/bin/Debug/Test_Roaming.exe b/Test_Roaming/bin/Debug/Test_Roaming.exe
index 204aacd..89e3930 100644
Binary files a/Test_Roaming/bin/Debug/Test_Roaming.exe and b/Test_Roaming/bin/Debug/Test_Roaming.exe differ
diff --git a/Test_Roaming/bin/Debug/Test_Roaming.pdb b/Test_Roaming/bin/Debug/Test_Roaming.pdb
index 5bdd217..2e8e5c8 100644
Binary files a/Test_Roaming/bin/Debug/Test_Roaming.pdb and b/Test_Roaming/bin/Debug/Test_Roaming.pdb differ
diff --git a/Test_Roaming/bin/Debug/heroaming.dll b/Test_Roaming/bin/Debug/heroaming.dll
index 79f782d..4f549c8 100644
Binary files a/Test_Roaming/bin/Debug/heroaming.dll and b/Test_Roaming/bin/Debug/heroaming.dll differ
diff --git a/Test_Roaming/bin/Debug/heroaming.pdb b/Test_Roaming/bin/Debug/heroaming.pdb
index aeb1c58..d82d952 100644
Binary files a/Test_Roaming/bin/Debug/heroaming.pdb and b/Test_Roaming/bin/Debug/heroaming.pdb differ
diff --git a/Test_Roaming/obj/Debug/Test_Roaming.csproj.AssemblyReference.cache b/Test_Roaming/obj/Debug/Test_Roaming.csproj.AssemblyReference.cache
index e5a9748..6815199 100644
Binary files a/Test_Roaming/obj/Debug/Test_Roaming.csproj.AssemblyReference.cache and b/Test_Roaming/obj/Debug/Test_Roaming.csproj.AssemblyReference.cache differ
diff --git a/Test_Roaming/obj/Debug/Test_Roaming.exe b/Test_Roaming/obj/Debug/Test_Roaming.exe
index 204aacd..89e3930 100644
Binary files a/Test_Roaming/obj/Debug/Test_Roaming.exe and b/Test_Roaming/obj/Debug/Test_Roaming.exe differ
diff --git a/Test_Roaming/obj/Debug/Test_Roaming.pdb b/Test_Roaming/obj/Debug/Test_Roaming.pdb
index 5bdd217..2e8e5c8 100644
Binary files a/Test_Roaming/obj/Debug/Test_Roaming.pdb and b/Test_Roaming/obj/Debug/Test_Roaming.pdb differ