diff --git a/app/src/main/java/org/linphone/LinphoneService.java b/app/src/main/java/org/linphone/LinphoneService.java
index da8411dc7..427b0be6a 100644
--- a/app/src/main/java/org/linphone/LinphoneService.java
+++ b/app/src/main/java/org/linphone/LinphoneService.java
@@ -404,7 +404,9 @@ public final class LinphoneService extends Service {
         LinphoneManager.destroy();
 
         // Make sure our notification is gone.
-        mNotificationManager.destroy();
+        if (mNotificationManager != null) {
+            mNotificationManager.destroy();
+        }
 
         // This will prevent the app from crashing if the service gets killed in background mode
         if (LinphoneActivity.isInstanciated()) {
diff --git a/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java b/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
index 03779e772..11ac05459 100644
--- a/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/NetworkSettingsFragment.java
@@ -101,6 +101,10 @@ public class NetworkSettingsFragment extends Fragment {
 
         mAndroidBatterySaverSettings =
                 mRootView.findViewById(R.id.pref_android_battery_protected_settings);
+        mAndroidBatterySaverSettings.setVisibility(
+                DeviceUtils.hasDevicePowerManager(LinphoneActivity.instance())
+                        ? View.VISIBLE
+                        : View.GONE);
     }
 
     protected void setListeners() {
@@ -209,7 +213,9 @@ public class NetworkSettingsFragment extends Fragment {
                         Intent intent =
                                 DeviceUtils.getDevicePowerManagerIntent(
                                         LinphoneActivity.instance());
-                        startActivity(intent);
+                        if (intent != null) {
+                            startActivity(intent);
+                        }
                     }
                 });
     }