diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f7a251..511b35c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
+## v1.0.0-beta7 (26.04.2024)
+
+* ActivityNotFoundException and ClassNotFoundException fixed.
+
 ## v1.0.0-beta6 (24.04.2024)
+
 * The "Rename" feature added.
 * Dialogs UI improvement
 * The issue of license URLs redirecting to the wrong address fixed
diff --git a/app/build.gradle b/app/build.gradle
index 29caeff..483dec5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         applicationId "com.sn.snfilemanager"
         minSdk 26
         targetSdk 34
-        versionCode 6
-        versionName "1.0.0-beta6"
+        versionCode 7
+        versionName "1.0.0-beta7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/sn/snfilemanager/core/extensions/Context.kt b/app/src/main/java/com/sn/snfilemanager/core/extensions/Context.kt
index e9e0642..4c102e6 100644
--- a/app/src/main/java/com/sn/snfilemanager/core/extensions/Context.kt
+++ b/app/src/main/java/com/sn/snfilemanager/core/extensions/Context.kt
@@ -112,7 +112,7 @@ fun Context.startActivitySafely(intent: Intent) {
     try {
         startActivity(intent)
     } catch (e: ActivityNotFoundException) {
-        // Todo
+        e.message?.let { errorToast(it) }
     }
 }
 
diff --git a/app/src/main/java/com/sn/snfilemanager/feature/home/HomeFragment.kt b/app/src/main/java/com/sn/snfilemanager/feature/home/HomeFragment.kt
index 81b8964..9fac3ed 100644
--- a/app/src/main/java/com/sn/snfilemanager/feature/home/HomeFragment.kt
+++ b/app/src/main/java/com/sn/snfilemanager/feature/home/HomeFragment.kt
@@ -9,7 +9,6 @@ import android.os.Build
 import android.os.Environment
 import android.provider.Settings
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -22,6 +21,7 @@ import com.sn.snfilemanager.core.extensions.getPackage
 import com.sn.snfilemanager.core.extensions.infoToast
 import com.sn.snfilemanager.core.extensions.observe
 import com.sn.snfilemanager.core.extensions.openUrl
+import com.sn.snfilemanager.core.extensions.startActivitySafely
 import com.sn.snfilemanager.core.util.Constant
 import com.sn.snfilemanager.core.util.DocumentType
 import com.sn.snfilemanager.core.util.RootPath
@@ -129,14 +129,15 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>() {
             }
         }
 
-    @RequiresApi(Build.VERSION_CODES.R)
     private fun routeFileAccessSettings() {
-        val intent =
-            Intent(
-                Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
-                Uri.parse(context?.getPackage()),
-            )
-        startActivity(intent)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val intent =
+                Intent(
+                    Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+                    Uri.parse(context?.getPackage()),
+                )
+            context?.startActivitySafely(intent)
+        }
     }
 
     private fun routeAppSettings() {
@@ -145,7 +146,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>() {
                 Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
                 Uri.parse(context?.getPackage()),
             )
-        startActivity(intent)
+        context?.startActivitySafely(intent)
     }
 
     private fun routeNotificationSettings() {
@@ -156,7 +157,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>() {
                     action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
                     putExtra(Settings.EXTRA_APP_PACKAGE, context?.packageName)
                 }
-            context?.startActivity(settingsIntent)
+            context?.startActivitySafely(settingsIntent)
         }
     }
 
diff --git a/mediastorepv b/mediastorepv
index ae3adc0..4a38a15 160000
--- a/mediastorepv
+++ b/mediastorepv
@@ -1 +1 @@
-Subproject commit ae3adc0fccb36372d1cb996df6846a8e59b8b1be
+Subproject commit 4a38a153e00ac4ca701debde26fece1082eedd70