diff --git a/Tools/AutoClient/Modes/FolderStore/FileSaver.cs b/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
index 733044d2..86507044 100644
--- a/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
+++ b/Tools/AutoClient/Modes/FolderStore/FileSaver.cs
@@ -165,8 +165,7 @@ namespace AutoClient.Modes.FolderStore
             }
             catch (Exception exc)
             {
-                entry.EncodedCid = string.Empty;
-                entry.PurchaseId = string.Empty;
+                entry.ClearPurchase();
                 saveChanges();
                 log.Error("Failed to start new purchase: " + exc);
                 HasFailed = true;
@@ -215,8 +214,7 @@ namespace AutoClient.Modes.FolderStore
                         else if (!update.IsSubmitted)
                         {
                             Log("Request failed to start. State: " + update.State);
-                            entry.EncodedCid = string.Empty;
-                            entry.PurchaseId = string.Empty;
+                            entry.ClearPurchase();
                             saveChanges();
                             return;
                         }
diff --git a/Tools/AutoClient/Modes/FolderStore/FolderStatus.cs b/Tools/AutoClient/Modes/FolderStore/FolderStatus.cs
index e9b7ec14..abb9c52a 100644
--- a/Tools/AutoClient/Modes/FolderStore/FolderStatus.cs
+++ b/Tools/AutoClient/Modes/FolderStore/FolderStatus.cs
@@ -16,6 +16,13 @@
         public string EncodedCid { get; set; } = string.Empty;
         public string PurchaseId { get; set; } = string.Empty;
         public DateTime PurchaseFinishedUtc { get; set; } = DateTime.MinValue;
+
+        public void ClearPurchase()
+        {
+            EncodedCid = string.Empty;
+            PurchaseId = string.Empty;
+            PurchaseFinishedUtc = DateTime.MinValue;
+        }
     }
 
     [Serializable]