diff --git a/Tools/AutoClient/Modes/FolderStore/FileSaver.cs b/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
index 448755f0..a4884372 100644
--- a/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
+++ b/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
@@ -242,6 +242,7 @@ namespace AutoClient.Modes.FolderStore
             {
                 entry.EncodedCid = string.Empty;
                 entry.PurchaseId = string.Empty;
+                stats.StorageRequestStats.FailedToStart++;
                 saveHandler.SaveChanges();
                 log.Error("Failed to start new purchase: " + exc);
                 resultHandler.OnFailure();
@@ -263,7 +264,6 @@ namespace AutoClient.Modes.FolderStore
                     throw new Exception("CID received from storage request was not protected.");
                 }
 
-                saveHandler.SaveChanges();
                 Log("Saved new purchaseId: " + entry.PurchaseId);
                 return request;
             }
@@ -299,6 +299,7 @@ namespace AutoClient.Modes.FolderStore
                             Log("Request failed to start. State: " + update.State);
                             entry.EncodedCid = string.Empty;
                             entry.PurchaseId = string.Empty;
+                            stats.StorageRequestStats.FailedToStart++;
                             saveHandler.SaveChanges();
                             return;
                         }
diff --git a/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs b/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
index bf513dd2..82afbc2a 100644
--- a/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
+++ b/Tools/AutoClient/Modes/FolderStore/FolderSaver.cs
@@ -48,9 +48,6 @@ namespace AutoClient.Modes.FolderStore
                 slowModeHandler.Check();
                 
                 CheckAndSaveChanges();
-
-                SaveChanges();
-                Thread.Sleep(100);
             }
 
             app.Log.Log("All files processed.");
@@ -62,7 +59,7 @@ namespace AutoClient.Modes.FolderStore
             {
                 changeCounter = 0;
                 saveFolderJsonCounter++;
-                if (saveFolderJsonCounter > 5)
+                if (saveFolderJsonCounter > 10)
                 {
                     saveFolderJsonCounter = 0;
                     balanceChecker.Check();