diff --git a/src/com/android/contacts/calllog/PhoneNumberHelper.java b/src/com/android/contacts/calllog/PhoneNumberHelper.java
index ba24021..bf493f5 100644
--- a/src/com/android/contacts/calllog/PhoneNumberHelper.java
+++ b/src/com/android/contacts/calllog/PhoneNumberHelper.java
@@ -121,6 +121,9 @@
 
     /** Returns the geocode associated with a phone number or the empty string if not available. */
     public String getGeocodeForNumber(String number, String countryIso) {
+        if (!canGeocode(number)) {
+            return "";
+        }
         PhoneNumber structuredPhoneNumber = parsePhoneNumber(number, countryIso);
         if (structuredPhoneNumber != null) {
             return mPhoneNumberOfflineGeocoder.getDescriptionForNumber(
@@ -129,4 +132,9 @@
             return "";
         }
     }
+
+    /** Returns true if it is possible to compute a geocode for the given number. */
+    private boolean canGeocode(CharSequence number) {
+        return canPlaceCallsTo(number) && !isVoicemailNumber(number);
+    }
 }
