diff --git a/increment_version.sh b/increment_version.sh
index f655fcaaaa..ac6a68897a 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -30,13 +30,15 @@ pushd "$mydir" > /dev/null
 
 do_translation_pull=0
 
-if git remote get-url weblate > /dev/null; then
-    echo "Pulling translations..."
-    translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit"
-    git fetch weblate
-    git merge weblate/sc --no-edit
-else
-    echo "WARN: remote weblate not found, not updating translations"
+if [ "$release_type" = "normal" ] && [ "$preview" != 1 ]; then
+    if git remote get-url weblate > /dev/null; then
+        echo "Pulling translations..."
+        translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit"
+        git fetch weblate
+        git merge weblate/sc --no-edit
+    else
+        echo "WARN: remote weblate not found, not updating translations"
+    fi
 fi
 
 last_tag=`downstream_latest_tag`
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index c610326a94..adc466f88a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -58,6 +58,7 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
 import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
+import java.lang.RuntimeException
 import javax.inject.Inject
 
 /**
@@ -256,7 +257,11 @@ internal class LocalEchoEventFactory @Inject constructor(
 
     private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData): Event {
         val mediaDataRetriever = MediaMetadataRetriever()
-        mediaDataRetriever.setDataSource(context, attachment.queryUri)
+        try {
+            mediaDataRetriever.setDataSource(context, attachment.queryUri)
+        } catch (e: RuntimeException) {
+            e.printStackTrace()
+        }
 
         // Use frame to calculate height and width as we are sure to get the right ones
         val firstFrame: Bitmap? = mediaDataRetriever.frameAtTime
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
index 78136c274a..67b1ded065 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
@@ -23,6 +23,7 @@ import android.provider.MediaStore
 import im.vector.lib.multipicker.entity.MultiPickerAudioType
 import im.vector.lib.multipicker.entity.MultiPickerImageType
 import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import java.lang.RuntimeException
 
 internal fun Uri.toMultiPickerImageType(context: Context): MultiPickerImageType? {
     val projection = arrayOf(
@@ -88,7 +89,11 @@ internal fun Uri.toMultiPickerVideoType(context: Context): MultiPickerVideoType?
 
             context.contentResolver.openFileDescriptor(this, "r")?.use { pfd ->
                 val mediaMetadataRetriever = MediaMetadataRetriever()
-                mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                try {
+                    mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                } catch (e: RuntimeException) {
+                    e.printStackTrace()
+                }
                 duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
                 width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
                 height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0