diff --git a/core/java/android/hardware/hdmi/HdmiClient.java b/core/java/android/hardware/hdmi/HdmiClient.java
index 1a52f11e7c04f..cee6a5b16a3cf 100644
--- a/core/java/android/hardware/hdmi/HdmiClient.java
+++ b/core/java/android/hardware/hdmi/HdmiClient.java
@@ -63,6 +63,9 @@ public abstract class HdmiClient {
         if (listener == null) {
             throw new IllegalArgumentException("listener must not be null.");
         }
+        if (executor == null) {
+            throw new IllegalArgumentException("executor must not be null.");
+        }
         try {
             mService.deviceSelect(logicalAddress,
                     getCallbackWrapper(logicalAddress, executor, listener));