1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 440b5f9..345f505 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -328,7 +328,7 @@ class WebViewChromium implements WebViewProvider,
         // have the result of that URL replace the content of the current page.
         final String JAVASCRIPT_SCHEME = "javascript:";
         if (mAppTargetSdkVersion < Build.VERSION_CODES.KITKAT &&
-                url.startsWith(JAVASCRIPT_SCHEME)) {
+                url != null && url.startsWith(JAVASCRIPT_SCHEME)) {
             mAwContents.evaluateJavaScriptEvenIfNotYetNavigated(
                     url.substring(JAVASCRIPT_SCHEME.length()));
             return;
@@ -341,6 +341,10 @@ class WebViewChromium implements WebViewProvider,
 
     @Override
     public void loadUrl(String url) {
+        // Early out to match old WebView implementation
+        if (url == null) {
+            return;
+        }
         loadUrl(url, null);
     }