diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 41f0bdd777d98..ace945d156008 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -624,6 +624,8 @@ public class TelephonyManager {
             return getITelephony().getDeviceId();
         } catch (RemoteException ex) {
             return null;
+        } catch (NullPointerException ex) {
+            return null;
         }
     }