diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index f5702c4cae37e32ba7d5c6fe3d95c198096e712a..436e7e7aba6f74e546d0f7471ec74c370d652376 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -97,7 +97,7 @@ public class SettingsActivity extends XmppActivity implements OnSharedPreference
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data.getData() == null) return;
+        if (data == null || data.getData() == null) return;
 
         SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(this);
         p.edit().putString("sticker_directory", data.getData().toString()).commit();