diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 0b78d787608..a6427ae592d 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -36,7 +36,6 @@ public class UserPreference extends RestrictedPreference {
     private static final int ALPHA_DISABLED = 102;
 
     public static final int USERID_UNKNOWN = -10;
-    public static final int USERID_GUEST_DEFAULTS = -11;
     public static final Comparator<UserPreference> SERIAL_NUMBER_COMPARATOR =
             (p1, p2) -> {
 
@@ -93,8 +92,6 @@ public class UserPreference extends RestrictedPreference {
             // If the userId is unknown
             if (mUserId == USERID_UNKNOWN) {
                 return Integer.MAX_VALUE;
-            } else if (mUserId == USERID_GUEST_DEFAULTS) {
-                return Integer.MAX_VALUE - 1;
             }
             mSerialNumber = ((UserManager) getContext().getSystemService(Context.USER_SERVICE))
                     .getUserSerialNumber(mUserId);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 6e82aab390d..64f9a2c91ce 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -49,6 +49,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.SimpleAdapter;
+import android.widget.Toast;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
@@ -493,6 +494,13 @@ public class UserSettings extends SettingsPreferenceFragment
         }
     }
 
+    private void onUserCreationFailed() {
+        Toast.makeText(getContext(),
+                com.android.settingslib.R.string.add_user_failed,
+                Toast.LENGTH_SHORT).show();
+        hideUserCreatingDialog();
+    }
+
     private void openUserDetails(UserInfo userInfo, boolean newUser) {
         Bundle extras = new Bundle();
         extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
@@ -791,7 +799,7 @@ public class UserSettings extends SettingsPreferenceFragment
                         mAddingUser = false;
                         mPendingUserIcon = null;
                         mPendingUserName = null;
-                        ThreadUtils.postOnMainThread(() -> hideUserCreatingDialog());
+                        ThreadUtils.postOnMainThread(() -> onUserCreationFailed());
                         return;
                     }
 
@@ -1082,6 +1090,12 @@ public class UserSettings extends SettingsPreferenceFragment
             mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);
             UserInfo guest = mUserManager.createGuest(
                     getContext(), getString(com.android.settingslib.R.string.user_guest));
+            if (guest == null) {
+                Toast.makeText(getContext(),
+                        com.android.settingslib.R.string.add_user_failed,
+                        Toast.LENGTH_SHORT).show();
+                return true;
+            }
             openUserDetails(guest, true);
             return true;
         }