diff --git a/Android.mk b/Android.mk
index a425dcc..b12d32e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,6 @@
         src/com/android/phone/INetworkQueryServiceCallback.aidl
 
 LOCAL_PACKAGE_NAME := TeleService
-LOCAL_OVERRIDES_PACKAGES := Phone
 
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index d512b88..d132ea5 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -1475,7 +1475,7 @@
             // querying a new CallerInfo using the connection's phone number.
             String number = c.getAddress();
 
-            if (info != null) {
+            if (info != null && info != CallGatewayManager.EMPTY_INFO) {
                 // Gateway number, the connection number is actually the gateway number.
                 // need to lookup via dialed number.
                 number = info.trueNumber;