diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index e053d0d7d3..886d603999 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3102,8 +3102,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void updateProfilePicture() {
-    profilePictureView.glide = GlideApp.with(this);
-    profilePictureView.update(recipient, threadId);
+    try {
+      profilePictureView.glide = GlideApp.with(this);
+      profilePictureView.update(recipient, threadId);
+    } catch (Exception exception) {
+      // Do nothing
+    }
   }
 
   private void updateSubtitleTextView() {
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
index 1c57af91bc..baaedd11a9 100644
--- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
+++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
@@ -140,7 +140,12 @@ class SaveAttachmentTask : ProgressDialogAsyncTask<SaveAttachmentTask.Attachment
             }
         }
 
-        val mediaFileUri = resolver.insert(collectionUri, mediaRecord)
+        var mediaFileUri: Uri?
+        try {
+            mediaFileUri = resolver.insert(collectionUri, mediaRecord)
+        } catch (exception: Exception) {
+            return null
+        }
         if (mediaFileUri == null) return null
 
         val inputStream = PartAuthority.getAttachmentStream(context, attachment.uri)