diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
index 6186de3be96..8257bf3a987 100644
--- a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
@@ -54,7 +54,6 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia
     private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar;
     private List<SubscriptionInfo> mSubscriptionsToBeDeleted;
     private SubscriptionInfo mSubscriptionToBeDeleted;
-    private AlertDialog mDeleteSimConfirmDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,14 +64,14 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia
         mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
         mSubscriptionsToBeDeleted =
                 SubscriptionUtil.findAllSubscriptionsInGroup(mSubscriptionManager, subId);
-        mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
 
-        if (mSubscriptionToBeDeleted == null || mDeleteEuiccSubscriptionSidecar == null) {
+        if (mSubscriptionToBeDeleted == null || mSubscriptionsToBeDeleted.isEmpty()) {
             Log.e(TAG, "Cannot find subscription with sub ID: " + subId);
             finish();
             return;
         }
 
+        mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
         if (savedInstanceState == null) {
             showDeleteSimConfirmDialog();
         }
diff --git a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
index 3bda9c57c7c..c82220edeca 100644
--- a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
+++ b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
@@ -105,7 +105,7 @@ public abstract class EuiccOperationSidecar extends SidecarFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mEuiccManager = (EuiccManager) getContext().getSystemService(Context.EUICC_SERVICE);
+        mEuiccManager = getContext().getSystemService(EuiccManager.class);
 
         getContext()
                 .getApplicationContext()