1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/common/util/PhoneNumberHelper.java
index 39f8a39b..3c057052 100644
--- a/src/com/android/contacts/common/util/PhoneNumberHelper.java
+++ b/src/com/android/contacts/common/util/PhoneNumberHelper.java
@@ -118,8 +118,10 @@ public class PhoneNumberHelper {
      * is made public.
      */
     public static String formatNumber(String phoneNumber, String defaultCountryIso) {
-        // Do not attempt to format numbers that start with a hash or star symbol.
-        if (phoneNumber.startsWith("#") || phoneNumber.startsWith("*")) {
+        // Do not attempt to format numbers that are empty or start with a hash
+        // or star symbol.
+        if (TextUtils.isEmpty(phoneNumber) || phoneNumber.startsWith("#") ||
+                phoneNumber.startsWith("*")) {
             return phoneNumber;
         }