1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/webkit/GeolocationService.java b/core/java/android/webkit/GeolocationService.java
index 24306f407b90..8378a8b24873 100755
--- a/core/java/android/webkit/GeolocationService.java
+++ b/core/java/android/webkit/GeolocationService.java
@@ -165,6 +165,12 @@ final class GeolocationService implements LocationListener {
         } catch(SecurityException e) {
             Log.e(TAG, "Caught security exception registering for location updates from system. " +
                 "This should only happen in DumpRenderTree.");
+        } catch(IllegalArgumentException e) {
+            Log.e(TAG, "Caught IllegalArugument Exception: Either provider or listener is null");
+            e.printStackTrace();
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Caught RuntimeException");
+            e.printStackTrace();
         }
     }