diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java
index 2983e6339d4bb..a80a3e2b826e8 100644
--- a/telecomm/java/android/telecom/CallerInfo.java
+++ b/telecomm/java/android/telecom/CallerInfo.java
@@ -697,12 +697,13 @@ public static String getGeoDescription(Context context, String number) {
                     + Log.pii(number) + "'");
         }
 
-        if (pn != null) {
+        if (pn == null || locale == null) {
+            Log.w(TAG, "pn and/or locale was null in getGeoDescription");
+            return null;
+        } else {
             String description = geocoder.getDescriptionForNumber(pn, locale);
             if (VDBG) Log.v(TAG, "- got description: '" + description + "'");
             return description;
-        } else {
-            return null;
         }
     }