diff --git a/EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj b/EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj
index 2563e9b..c8374f2 100644
--- a/EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj
+++ b/EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>1.6.0</AssemblyVersion>
-    <FileVersion>1.6.0</FileVersion>
+    <AssemblyVersion>1.6.1</AssemblyVersion>
+    <FileVersion>1.6.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/EftPatchHelper/EftPatchHelper/Helpers/R2Helper.cs b/EftPatchHelper/EftPatchHelper/Helpers/R2Helper.cs
index 1bffd65..e3709a5 100644
--- a/EftPatchHelper/EftPatchHelper/Helpers/R2Helper.cs
+++ b/EftPatchHelper/EftPatchHelper/Helpers/R2Helper.cs
@@ -48,13 +48,19 @@ public class R2Helper
             AnsiConsole.MarkupLine("[red]failed to get bucket contents[/]");
             return false;
         }
+
+        if (listBucketResponse.S3Objects.Count == 0)
+        {
+            AnsiConsole.MarkupLine("[green]bucket is empty[/]");
+            return true;
+        }
         
         AnsiConsole.MarkupLine("[blue]Removing old content[/]");
         foreach (var s3Object in listBucketResponse.S3Objects)
         {
             var deleteResponse = await _client.DeleteObjectAsync(BucketName, s3Object.Key);
 
-            if (deleteResponse.HttpStatusCode != HttpStatusCode.OK)
+            if ((int)deleteResponse.HttpStatusCode < 200 || (int)deleteResponse.HttpStatusCode > 299)
             {
                 AnsiConsole.MarkupLine($"[red]failed to delete {BucketName}::{s3Object.Key}[/]");
                 return false;
diff --git a/EftPatchHelper/EftPatchHelper/Program.cs b/EftPatchHelper/EftPatchHelper/Program.cs
index 0b6c1d7..71100c1 100644
--- a/EftPatchHelper/EftPatchHelper/Program.cs
+++ b/EftPatchHelper/EftPatchHelper/Program.cs
@@ -32,8 +32,15 @@ namespace EftPatchHelper
             var version = Assembly.GetExecutingAssembly().GetName().Version;
             AnsiConsole.Write(new Rule($"[purple]v{version}[/]").Centered().RuleStyle("blue"));
 
-            var host = ConfigureHost(args);
-            host.Services.GetRequiredService<Program>().Run();
+            try
+            {
+                var host = ConfigureHost(args);
+                host.Services.GetRequiredService<Program>().Run();
+            }
+            catch (Exception ex)
+            {
+                AnsiConsole.MarkupLine($"[red]{ex.Message.EscapeMarkup()}[/]");
+            }
 
             AnsiConsole.MarkupLine("Press [blue]Enter[/] to close ...");
             Console.ReadLine();
diff --git a/EftPatchHelper/EftPatchHelper/Tasks/StartupSettingsTask.cs b/EftPatchHelper/EftPatchHelper/Tasks/StartupSettingsTask.cs
index 50beab4..47728bc 100644
--- a/EftPatchHelper/EftPatchHelper/Tasks/StartupSettingsTask.cs
+++ b/EftPatchHelper/EftPatchHelper/Tasks/StartupSettingsTask.cs
@@ -74,7 +74,7 @@ namespace EftPatchHelper.Tasks
 
             if (_settings.UsingR2())
             {
-                _options.UplaodToR2 = new ConfirmationPrompt("Upload to R2?").Show(AnsiConsole.Console);
+                _options.UplaodToR2 = new ConfirmationPrompt($"Upload to R2 ({_settings.R2BucketName})?").Show(AnsiConsole.Console);
             }
 
             if (_settings.SftpUploads.Count > 0)
diff --git a/EftPatchHelper/EftPatchHelper/Tasks/UploadMirrorListTasks.cs b/EftPatchHelper/EftPatchHelper/Tasks/UploadMirrorListTasks.cs
index e44f1f1..162dea2 100644
--- a/EftPatchHelper/EftPatchHelper/Tasks/UploadMirrorListTasks.cs
+++ b/EftPatchHelper/EftPatchHelper/Tasks/UploadMirrorListTasks.cs
@@ -41,10 +41,12 @@ namespace EftPatchHelper.Tasks
 
         public bool CreateMirrorList(FileInfo mirrorListFileInfo)
         {
+            var sourcePatchVersion = _options.SourceClient.Version.Split('.').Last();
+            var targetPatchVersion = _options.TargetClient.Version.Split('.').Last();
             var mirrorInfo = new PatchInfo
             {
-                SourceClientVersion = int.Parse(_options.SourceClient.Version),
-                TargetClientVersion = int.Parse(_options.TargetClient.Version),
+                SourceClientVersion = int.Parse(sourcePatchVersion),
+                TargetClientVersion = int.Parse(targetPatchVersion),
                 Mirrors = _options.MirrorList.Values.ToList() 
             };