1 files changed, 7 insertions, 2 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java
index a589fe9..bd859e8 100644
--- a/voip/java/android/net/sip/SipManager.java
+++ b/voip/java/android/net/sip/SipManager.java
@@ -23,6 +23,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.util.Log;
 
 import java.text.ParseException;
 
@@ -83,6 +84,8 @@ public class SipManager {
     /** Part of the incoming call intent. */
     public static final String EXTRA_OFFER_SD = "android:sipOfferSD";
 
+    private static final String TAG = "SipManager";
+
     private ISipService mSipService;
     private Context mContext;
 
@@ -525,8 +528,10 @@ public class SipManager {
                 return ((session == null)
                         ? mUri
                         : session.getLocalProfile().getUriString());
-            } catch (RemoteException e) {
-                throw new RuntimeException(e);
+            } catch (Throwable e) {
+                // SipService died? SIP stack died?
+                Log.w(TAG, "getUri(): " + e);
+                return null;
             }
         }