diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index 88a13ae4522..eb6c9b1181c 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -174,9 +174,6 @@ public class ApnSettings extends RestrictedSettingsFragment
 
         final TelephonyManager updatedTelephonyManager =
                 mTelephonyManager.createForSubscriptionId(subId);
-        if (updatedTelephonyManager == null) {
-            return;
-        }
 
         // restart monitoring when subscription has been changed
         mTelephonyManager.listen(mPhoneStateListener,
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 6220d455e61..f0c1583887f 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -278,12 +278,11 @@ public class SubscriptionUtil {
      * Get phoneId or logical slot index for a subId if active, or INVALID_PHONE_INDEX if inactive.
      */
     public static int getPhoneId(Context context, int subId) {
-        SubscriptionManager subManager = (SubscriptionManager)
-                context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
         if (subManager == null) {
             return INVALID_SIM_SLOT_INDEX;
         }
-        SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
+        final SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
         if (info == null) {
             return INVALID_SIM_SLOT_INDEX;
         }