diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
index 5a94750babc5f8f9bc43507b0c5215d6a19536e0..47a40b0a5c25b9e498128b83d573720c2483282b 100644
--- a/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
@@ -179,7 +179,7 @@ public class AccountEditionActivity extends AppCompatActivity implements Account
 
     @Override
     public void onBackPressed() {
-        if (mBackHandlerInterface.onBackPressed()) {
+        if (mBackHandlerInterface != null && mBackHandlerInterface.onBackPressed()) {
             return;
         }
         if (frameLayout.getVisibility() == View.VISIBLE) {
@@ -303,6 +303,7 @@ public class AccountEditionActivity extends AppCompatActivity implements Account
             return isRing ? 3 : 4;
         }
 
+        @NonNull
         @Override
         public Fragment getItem(int position) {
             return isRing ? getRingPanel(position) : getSIPPanel(position);