diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index 0f612864..4eea015f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -901,7 +901,7 @@ class EditContactActivity : ContactActivity() {
             return
         }
 
-        contact!!.apply {
+        contact?.apply {
             val oldPhotoUri = photoUri
 
             prefix = contact_prefix.value
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index 5a8a599f..e0d02a37 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -92,7 +92,9 @@ class ViewContactActivity : ContactActivity() {
         (contact_appbar.layoutParams as RelativeLayout.LayoutParams).topMargin = statusBarHeight
         contact_toolbar.menu.apply {
             findItem(R.id.share).setOnMenuItemClickListener {
-                shareContact(fullContact!!)
+                if (fullContact != null) {
+                    shareContact(fullContact!!)
+                }
                 true
             }