Change summary
  src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
  Detailed changes
  
  
    
    @@ -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();