diff --git a/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java b/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
index 3d695e4c3..984c34cbf 100644
--- a/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
+++ b/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
@@ -83,8 +83,9 @@ public KeyEvent withFlag(KeyEventFlag keyEventFlag) {
      */
     public Map<String, Object> build() {
         var map = new HashMap<String, Object>();
-        ofNullable(this.keyCode).map(x -> map.put("keycode", x)).orElseThrow(() -> new IllegalStateException(
-                "The key code must be set"));
+        ofNullable(this.keyCode).ifPresentOrElse(x -> map.put("keycode", x), () -> {
+            throw new IllegalStateException("The key code must be set");
+        });
         ofNullable(this.metaState).ifPresent(x -> map.put("metastate", x));
         ofNullable(this.flags).ifPresent(x -> map.put("flags", x));
         return Collections.unmodifiableMap(map);