diff --git a/core/java/android/app/people/PeopleSpaceTile.java b/core/java/android/app/people/PeopleSpaceTile.java
index e645831a31b19..8866c767a606e 100644
--- a/core/java/android/app/people/PeopleSpaceTile.java
+++ b/core/java/android/app/people/PeopleSpaceTile.java
@@ -170,7 +170,7 @@ public class PeopleSpaceTile implements Parcelable {
     /** Converts a {@link PeopleSpaceTile} into a {@link PeopleSpaceTile.Builder}. */
     public Builder toBuilder() {
         Builder builder =
-                new Builder(mId, mUserName.toString(), mUserIcon, mIntent);
+                new Builder(mId, mUserName, mUserIcon, mIntent);
         builder.setContactUri(mContactUri);
         builder.setUserHandle(mUserHandle);
         builder.setPackageName(mPackageName);
@@ -209,7 +209,7 @@ public class PeopleSpaceTile implements Parcelable {
         private List<ConversationStatus> mStatuses;
 
         /** Builder for use only if a shortcut is not available for the tile. */
-        public Builder(String id, String userName, Icon userIcon, Intent intent) {
+        public Builder(String id, CharSequence userName, Icon userIcon, Intent intent) {
             mId = id;
             mUserName = userName;
             mUserIcon = userIcon;
diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
index ff14abe118ab1..98d886661cea1 100644
--- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
@@ -132,7 +132,9 @@ public class PeopleSpaceActivity extends Activity {
     /** Sets {@code tileView} with the data in {@code conversation}. */
     private void setTileView(PeopleSpaceTileView tileView, PeopleSpaceTile tile) {
         try {
-            tileView.setName(tile.getUserName().toString());
+            if (tile.getUserName() != null) {
+                tileView.setName(tile.getUserName().toString());
+            }
             tileView.setPersonIcon(getPersonIconBitmap(mContext, tile,
                     getSizeInDp(mContext, R.dimen.avatar_size_for_medium,
                             mContext.getResources().getDisplayMetrics().density)));
diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
index 3883c00f40b3c..bc9a45b3db62a 100644
--- a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
@@ -305,7 +305,9 @@ public class PeopleTileViewHelper {
                 views.setViewVisibility(R.id.availability, View.GONE);
             }
 
-            views.setTextViewText(R.id.name, mTile.getUserName().toString());
+            if (mTile.getUserName() != null) {
+                views.setTextViewText(R.id.name, mTile.getUserName().toString());
+            }
             views.setBoolean(R.id.image, "setClipToOutline", true);
             views.setImageViewBitmap(R.id.person_icon,
                     getPersonIconBitmap(mContext, mTile, maxAvatarSize));