diff --git a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
index b2f6c1d4c289f..ef5f6d71b8b6e 100644
--- a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
+++ b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
@@ -55,7 +55,9 @@ public class ICameraDeviceUserWrapper {
     }
 
     public void unlinkToDeath(IBinder.DeathRecipient recipient, int flags) {
-        mRemoteDevice.asBinder().unlinkToDeath(recipient, flags);
+        if (mRemoteDevice.asBinder() != null) {
+            mRemoteDevice.asBinder().unlinkToDeath(recipient, flags);
+        }
     }
 
     public void disconnect()  {