diff --git a/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt
index fdf98661d..320b277bc 100644
--- a/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt
@@ -217,7 +217,7 @@ class MainActivity : SimpleActivity() {
     private fun loadMessages() {
         if (isQPlus()) {
             val roleManager = getSystemService(RoleManager::class.java)
-            if (roleManager!!.isRoleAvailable(RoleManager.ROLE_SMS)) {
+            if (roleManager?.isRoleAvailable(RoleManager.ROLE_SMS) == true) {
                 if (roleManager.isRoleHeld(RoleManager.ROLE_SMS)) {
                     askPermissions()
                 } else {
diff --git a/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
index e6acf45b7..30bdf8b64 100644
--- a/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
@@ -119,7 +119,7 @@ class ManageBlockedKeywordsActivity : SimpleActivity(), RefreshRecyclerViewListe
 
     private fun tryImportBlockedKeywordsFromFile(uri: Uri) {
         when (uri.scheme) {
-            "file" -> importBlockedKeywords(uri.path!!)
+            "file" -> uri.path?.let { importBlockedKeywords(it) }
             "content" -> {
                 val tempFile = getTempFile("blocked", "blocked_keywords.txt")
                 if (tempFile == null) {