diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index c6f87966d..c11604d83 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -434,8 +434,12 @@ class NotificationsManager @MainThread constructor(private val context: Context)
         if (clearPreviousChannels) {
             Log.w("$TAG We were asked to remove all existing notification channels")
             for (channel in notificationManager.notificationChannels) {
-                Log.i("$TAG Deleting notification channel ID [${channel.id}]")
-                notificationManager.deleteNotificationChannel(channel.id)
+                try {
+                    Log.i("$TAG Deleting notification channel ID [${channel.id}]")
+                    notificationManager.deleteNotificationChannel(channel.id)
+                } catch (e: Exception) {
+                    Log.e("$TAG Failed to delete notification channel ID [${channel.id}]: $e")
+                }
             }
         }
 
diff --git a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
index c31c71a70..c2ec1490f 100644
--- a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
+++ b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
@@ -149,6 +149,7 @@ class TelecomCallControlCallback(
                 Log.i(
                     "$TAG We're asked to [${if (muted) "mute" else "unmute"}] the call in state [$callState]"
                 )
+                // This is to prevent mic not muted when joining conference if user decided to join as muted
                 if (muted || !LinphoneUtils.isCallOutgoing(callState, false)) {
                     call.microphoneMuted = muted
                 } else {
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
index f41b2bcae..e9c287533 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
@@ -70,14 +70,6 @@ class LandingFragment : Fragment() {
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = viewModel
 
-        coreContext.postOnCoreThread {
-            val dialPlan = PhoneNumberUtils.getDeviceDialPlan(requireContext())
-            if (dialPlan != null) {
-                viewModel.internationalPrefix.postValue(dialPlan.countryCallingCode)
-                viewModel.internationalPrefixIsoCountryCode.postValue(dialPlan.isoCountryCode)
-            }
-        }
-
         binding.setBackClickListener {
             requireActivity().finish()
         }
@@ -138,6 +130,14 @@ class LandingFragment : Fragment() {
                 )
             }
         }
+
+        coreContext.postOnCoreThread {
+            val dialPlan = PhoneNumberUtils.getDeviceDialPlan(requireContext())
+            if (dialPlan != null) {
+                viewModel.internationalPrefix.postValue(dialPlan.countryCallingCode)
+                viewModel.internationalPrefixIsoCountryCode.postValue(dialPlan.isoCountryCode)
+            }
+        }
     }
 
     private fun goToRegisterFragment() {
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractTopBarViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractTopBarViewModel.kt
index f50110ecf..339044da2 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractTopBarViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractTopBarViewModel.kt
@@ -128,6 +128,7 @@ open class AbstractTopBarViewModel @UiThread constructor() : ViewModel() {
 
             if (defaultAccount == null) {
                 Log.w("$TAG Default account is now null!")
+                return
             } else {
                 Log.i(
                     "$TAG Default account has changed [${defaultAccount.params.identityAddress?.asStringUriOnly()}]"