2 files changed, 5 insertions, 1 deletions
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index a5bced2..98538e4 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -30,6 +30,7 @@ import org.chromium.content.browser.ChildProcessLauncher;
 import org.chromium.content.browser.FileDescriptorInfo;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
+import org.chromium.content.common.SurfaceWrapper;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
@@ -331,7 +332,8 @@ public class ChildProcessService extends Service {
         }
 
         try {
-            return mCallback.getViewSurface(surfaceId).getSurface();
+            SurfaceWrapper wrapper = mCallback.getViewSurface(surfaceId);
+            return wrapper != null ? wrapper.getSurface() : null;
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to call getViewSurface: %s", e);
             return null;
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index 146129b..0fa969b 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -411,6 +411,8 @@ public class ChildProcessLauncher {
 
     @CalledByNative
     private static void registerViewSurface(int surfaceId, Surface surface) {
+        if (!surface.isValid())
+            throw new RuntimeException("Attempting to register invalid Surface.");
         sViewSurfaceMap.put(surfaceId, surface);
     }