diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index 49f135515..d0b5ef0a1 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -73,7 +73,7 @@ class ContactsManager @UiThread constructor() {
             )
 
             // TODO FIXME: doesn't work if a SIP address wasn't added to unknownContactsAvatarsMap yet
-            // For example if it was displayed so far in any list
+            // For example if it wasn't displayed so far in any list
             var atLeastSomeoneNew = false
             if (unknownContactsAvatarsMap.isNotEmpty()) {
                 for (friend in friends) {
diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index e64d0489d..7ca806025 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -405,10 +405,15 @@ class MainActivity : GenericActivity() {
             }
         } else {
             if (!isNewIntent && defaultDestination > 0) {
-                Log.i("$TAG Setting nav graph with expected start destination")
-                val navGraph = findNavController().navInflater.inflate(R.navigation.main_nav_graph)
-                navGraph.setStartDestination(defaultDestination)
-                findNavController().setGraph(navGraph, null)
+                try {
+                    Log.i("$TAG Setting nav graph with expected start destination")
+                    val navGraph =
+                        findNavController().navInflater.inflate(R.navigation.main_nav_graph)
+                    navGraph.setStartDestination(defaultDestination)
+                    findNavController().setGraph(navGraph, null)
+                } catch (ise: IllegalStateException) {
+                    Log.i("$TAG Failed to handle intent: $ise")
+                }
             }
         }
     }