diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 3f87a59..4cc03f3 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -1682,18 +1682,23 @@
 
   VideoSurfaceTexture getLocalVideoSurfaceTexture() {
     if (mLocalVideoSurfaceTexture == null) {
-      mLocalVideoSurfaceTexture =
-          VideoSurfaceBindings.createLocalVideoSurfaceTexture(
-              mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE));
+      boolean isPixel2017 = false;
+      if (mContext != null) {
+        isPixel2017 = mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE);
+      }
+      mLocalVideoSurfaceTexture = VideoSurfaceBindings.createLocalVideoSurfaceTexture(isPixel2017);
     }
     return mLocalVideoSurfaceTexture;
   }
 
   VideoSurfaceTexture getRemoteVideoSurfaceTexture() {
     if (mRemoteVideoSurfaceTexture == null) {
+      boolean isPixel2017 = false;
+      if (mContext != null) {
+        isPixel2017 = mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE);
+      }
       mRemoteVideoSurfaceTexture =
-          VideoSurfaceBindings.createRemoteVideoSurfaceTexture(
-              mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE));
+          VideoSurfaceBindings.createRemoteVideoSurfaceTexture(isPixel2017);
     }
     return mRemoteVideoSurfaceTexture;
   }
