diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
index 479acb66..6d70b9f8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
@@ -204,7 +204,11 @@ class EditContactActivity : ContactActivity() {
             putExtra("scaleUpIfNeeded", "true")
             clipData = ClipData("Attachment", arrayOf("text/uri-list"), ClipData.Item(lastPhotoIntentUri))
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            startActivityForResult(this, INTENT_CROP_PHOTO)
+            if (resolveActivity(packageManager) != null) {
+                startActivityForResult(this, INTENT_CROP_PHOTO)
+            } else {
+                toast(R.string.no_app_found)
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt
index 30181648..7aedd1af 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt
@@ -36,6 +36,10 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, priva
                 .create().apply {
             activity.setupDialogStuff(view, this, R.string.export_contacts) {
                 getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+                    if (view.export_contacts_list.adapter == null) {
+                        return@setOnClickListener
+                    }
+
                     val filename = view.export_contacts_filename.value
                     when {
                         filename.isEmpty() -> activity.toast(R.string.empty_name)