diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9527a9c287..6ec9785e12 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,6 +238,7 @@
     <string name="CreateProfileActivity_updating_and_encrypting_profile">Updating and encrypting profile</string>
     <string name="CreateProfileActivity_profile_photo">Profile photo</string>
     <string name="CreateProfileActivity_too_long">Too long</string>
+    <string name="CreateProfileActivity_error_capturing_photo_camera_did_not_return_image">Error capturing photo, camera did not return image</string>
 
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 8c190fb31f..a7827ee564 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -119,7 +119,9 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
 
     switch (requestCode) {
       case REQUEST_CODE_AVATAR:
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == Activity.RESULT_OK && data == null) {
+          Toast.makeText(this, R.string.CreateProfileActivity_error_capturing_photo_camera_did_not_return_image, Toast.LENGTH_LONG).show();
+        } else if (resultCode == Activity.RESULT_OK) {
           Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
           Uri inputFile  = data.getData();