diff --git a/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs b/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs
index bd70d9c1..de918a57 100644
--- a/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs
+++ b/Packages/com.tivadar.best.http/Runtime/Shared/Database/Database.cs
@@ -238,7 +238,10 @@ namespace Best.HTTP.Shared.Databases
             }
             finally
             {
-                this.rwlock.ExitWriteLock();
+                if (this.rwlock != null)
+                {
+                    this.rwlock.ExitWriteLock();
+                }
             }
         }
 
diff --git a/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs b/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs
index 003c97aa..9a5b7e6b 100644
--- a/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs
+++ b/Packages/com.tivadar.best.http/Runtime/Shared/Database/MetadataService.cs
@@ -98,17 +98,17 @@ namespace Best.HTTP.Shared.Databases
             }
             else
             {
-            for (int i = 0; i < this.Metadatas.Count; ++i)
-            {
-                var metadata = this.Metadatas[i];
+                for (int i = 0; i < this.Metadatas.Count; ++i)
+                {
+                    var metadata = this.Metadatas[i];
 
-                if (metadata.IsDeleted)
-                    continue;
+                    if (metadata.IsDeleted)
+                        continue;
 
-                metadata.SaveTo(stream);
+                    metadata.SaveTo(stream);
+                }
             }
         }
-        }
 
         public void LoadFrom(Stream stream)
         {