diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index e203b86dbcdb4902330375827f74f93a10384daa..97e23c08687fd3c69796d1c957e37ee8b1403fa8 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -187,7 +187,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 					break;
 			}
 		} else {
-			if (requestCode == Crop.REQUEST_CROP) {
+			if (requestCode == Crop.REQUEST_CROP  && data != null) {
 				Throwable throwable = Crop.getError(data);
 				if (throwable != null && throwable instanceof OutOfMemoryError) {
 					Toast.makeText(this,R.string.selection_too_large, Toast.LENGTH_SHORT).show();