diff --git a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
index 6582d86..0525b10 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
@@ -138,14 +138,15 @@ abstract class BatchesFolder(
                         filePaths,
                         outputFile,
                         parameter,
-                    )
+                    ).await()
+                    return outputFile
                 } catch (e: MediaConverter.FFmpegException) {
                     continue
                 }
             }
         }
 
-        return outputFile
+        throw MediaConverter.FFmpegException("Failed to concatenate")
     }
 
     fun exportFolderForSettings(): String {
diff --git a/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt b/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt
index 7d73732..b438bc4 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/MediaConverter.kt
@@ -70,13 +70,16 @@ class MediaConverter {
                         " -safe 0" +
                         " -i ${listFile.absolutePath}" +
                         extraCommand +
+                        " -strict normal" +
                         " -y" +
                         " $outputFile"
 
             FFmpegKit.executeAsync(
                 command
             ) { session ->
-                listFile.delete()
+                runCatching {
+                    listFile.delete()
+                }
 
                 if (!ReturnCode.isSuccess(session!!.returnCode)) {
                     Log.d(