Merge "Add Work Directory APIs in Contacts Provider"
diff --git a/src/com/android/providers/contacts/PhoneLookupWithStarPrefix.java b/src/com/android/providers/contacts/PhoneLookupWithStarPrefix.java
index a05dd05..7efc891 100644
--- a/src/com/android/providers/contacts/PhoneLookupWithStarPrefix.java
+++ b/src/com/android/providers/contacts/PhoneLookupWithStarPrefix.java
@@ -124,7 +124,7 @@
         while (cursor.moveToNext()) {
             final int numberIndex = cursor.getColumnIndex(PhoneLookup.NUMBER);
             final String phoneNumber = normalizeNumberWithStar(cursor.getString(numberIndex));
-            if (phoneNumber.startsWith("*")) {
+            if (phoneNumber != null && phoneNumber.startsWith("*")) {
                 return true;
             }
         }