diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 36b24ffb89543..4773cda39b1d3 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -492,10 +492,15 @@ public final class WebViewFactory {
     /** @hide */
     public static IWebViewUpdateService getUpdateService() {
         if (isWebViewSupported()) {
-            return IWebViewUpdateService.Stub.asInterface(
-                    ServiceManager.getService(WEBVIEW_UPDATE_SERVICE_NAME));
+            return getUpdateServiceUnchecked();
         } else {
             return null;
         }
     }
+
+    /** @hide */
+    static IWebViewUpdateService getUpdateServiceUnchecked() {
+        return IWebViewUpdateService.Stub.asInterface(
+                ServiceManager.getService(WEBVIEW_UPDATE_SERVICE_NAME));
+    }
 }
diff --git a/core/java/android/webkit/WebViewLibraryLoader.java b/core/java/android/webkit/WebViewLibraryLoader.java
index 6f9e8ece4b13a..21316e7db9e45 100644
--- a/core/java/android/webkit/WebViewLibraryLoader.java
+++ b/core/java/android/webkit/WebViewLibraryLoader.java
@@ -80,7 +80,7 @@ class WebViewLibraryLoader {
             } finally {
                 // We must do our best to always notify the update service, even if something fails.
                 try {
-                    WebViewFactory.getUpdateService().notifyRelroCreationCompleted();
+                    WebViewFactory.getUpdateServiceUnchecked().notifyRelroCreationCompleted();
                 } catch (RemoteException e) {
                     Log.e(LOGTAG, "error notifying update service", e);
                 }