diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 28894fb55..c9b8a8cfc 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -526,8 +526,10 @@ public class SettingsController extends BaseController { @Override public void onDestroy() { - appPreferences.unregisterProxyTypeListener(proxyTypeChangeListener); - appPreferences.unregisterProxyCredentialsListener(proxyCredentialsChangeListener); + if (appPreferences != null) { + appPreferences.unregisterProxyTypeListener(proxyTypeChangeListener); + appPreferences.unregisterProxyCredentialsListener(proxyCredentialsChangeListener); + } super.onDestroy(); }