Merge "Monkeys are touching my destroyed stuff" into jb-dev

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index d0d122c43afa..75e7b571af89 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -5827,7 +5827,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
                     }
                     data.mSlop = viewToContentDimension(mNavSlop);
                     removeTouchHighlight();
-                    if (!mBlockWebkitViewMessages) {
+                    if (!mBlockWebkitViewMessages && mWebViewCore != null) {
                         mWebViewCore.sendMessageAtFrontOfQueue(
                                 EventHub.HIT_TEST, data);
                     }