diff --git a/Duplicati/Library/Backend/S3/S3MinioClient.cs b/Duplicati/Library/Backend/S3/S3MinioClient.cs
index d52a7b57c..a4d5b63fb 100644
--- a/Duplicati/Library/Backend/S3/S3MinioClient.cs
+++ b/Duplicati/Library/Backend/S3/S3MinioClient.cs
@@ -222,6 +222,11 @@ namespace Duplicati.Library.Backend
         {
             if (e.ServerResponse?.StatusCode == System.Net.HttpStatusCode.NotFound || e.Response?.Code == "NoSuchKey")
                 throw new FileMissingException($"File {keyName} not found in bucket {bucketName}");
+
+            if (e is BucketNotFoundException)
+                throw new FolderMissingException($"Bucket {bucketName} not found");
+            if (e is ObjectNotFoundException)
+                throw new FileMissingException($"File {keyName} not found in bucket {bucketName}");
         }
 
         private Task ThrowExceptionIfBucketDoesNotExist(string bucketName, CancellationToken cancelToken)