diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 94ab11d..632b202 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -841,8 +841,10 @@
                             info, context.getResources());
                 }
                 String name = info != null ? info.name : null;
-                if (name == null) {
+                if (name == null && info != null) {
                     name = Integer.toString(info.id);
+                } else if (info == null) {
+                    name = context.getString(R.string.unknown);
                 }
                 userItem.mUser.mLabel = context.getResources().getString(
                         R.string.running_process_item_user_label, name);
