diff --git a/extras/android/RemoteHCI/app/src/main/java/com/github/google/bumble/remotehci/CommandLineInterface.kt b/extras/android/RemoteHCI/app/src/main/java/com/github/google/bumble/remotehci/CommandLineInterface.kt
index 182537a6..9b387a00 100644
--- a/extras/android/RemoteHCI/app/src/main/java/com/github/google/bumble/remotehci/CommandLineInterface.kt
+++ b/extras/android/RemoteHCI/app/src/main/java/com/github/google/bumble/remotehci/CommandLineInterface.kt
@@ -8,7 +8,11 @@ class CommandLineInterface {
             System.out.println("Starting proxy")
 
             var tcpPort = DEFAULT_TCP_PORT
-            if (args.size >= 1) {
+            if (args.isNotEmpty()) {
+                if (args[0] == "-h" || args[0] == "--help") {
+                    System.out.println("usage: <launch-command> [-h|--help] [<tcp-port>]")
+                    return
+                }
                 try {
                     tcpPort = args[0].toInt()
                 } catch (error: NumberFormatException) {