diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 0acb3f7801..bb69698f11 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -119,6 +119,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
   private Uri getStreamExtra() {
     Uri streamUri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+    if (streamUri == null) {
+      return null;
+    }
+
     if (streamUri.getAuthority().equals("com.google.android.apps.photos.contentprovider") &&
         streamUri.toString().endsWith("/ACTUAL"))
     {