diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
index fb621578e783237940468004da08a50a33d94703..c72f8ac4e7b4da1f7139843d234530940dc47f27 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
@@ -68,7 +68,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -380,6 +379,8 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
 
         animation.setDuration(150);
         animation.addUpdateListener(valueAnimator -> {
+            if (binding == null)
+                return;
             int upBy = (int) valueAnimator.getAnimatedValue();
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.previewContainer.getLayoutParams();
             layoutParams.setMargins(0, 0, 0, (int) (upBy * dpRatio));
@@ -1244,18 +1245,13 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
     public void finish() {
         Activity activity = getActivity();
         if (activity != null) {
+            activity.finishAndRemoveTask();
             if (mBackstackLost) {
-                activity.finishAndRemoveTask();
-                startActivity(
-                        Intent.makeMainActivity(
-                                new ComponentName(activity, HomeActivity.class)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-            } else {
-                activity.finish();
+                startActivity(Intent.makeMainActivity(new ComponentName(activity, HomeActivity.class)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
             }
         }
     }
 
-
     public void speakerClicked() {
         presenter.speakerClick(binding.callSpeakerBtn.isChecked());
     }