diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index 919720ffac7..21809837403 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -94,7 +94,8 @@ public class AppListPreference extends ListPreference {
             if (appInfo != null) {
                 applicationNames[index] = appInfo.loadLabel(pm);
                 mEntryDrawables[index] = appInfo.loadIcon(pm);
-                if (appInfo.packageName.contentEquals(defaultPackageName)) {
+                if (defaultPackageName != null &&
+                        appInfo.packageName.contentEquals(defaultPackageName)) {
                     selectedIndex = index;
                 }
                 index++;