diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
index 29e5f922b468a..34e3ce1ab641c 100644
--- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
@@ -604,10 +604,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem
         List<S> services = mServicesCacheList.get(resolvedUserId);
         if (services == null || services.size() == 0) {
             final boolean disabled = isDisabledLocked(userId);
-            if (mServiceNameResolver == null) {
-                return null;
-            }
-            if (mServiceNameResolver.isConfiguredInMultipleMode()) {
+            if (mServiceNameResolver != null && mServiceNameResolver.isConfiguredInMultipleMode()) {
                 services = newServiceListLocked(resolvedUserId, disabled,
                         mServiceNameResolver.getServiceNameList(userId));
             } else {
diff --git a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
index 58413c9c57056..b8f1db402a555 100644
--- a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
@@ -152,7 +152,8 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst
         updateIsSetupComplete(mUserId);
         mDisabled = disabled;
 
-        if (mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) {
+        if (mMaster.mServiceNameResolver != null
+                && mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) {
             updateServiceInfoListLocked();
         } else {
             updateServiceInfoLocked();