diff --git a/services/console-proxy/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
index 742f5c9f0cd4..972d5d753e8f 100644
--- a/services/console-proxy/rdpconsole/src/main/java/common/Client.java
+++ b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
@@ -210,7 +210,6 @@ private void help() {
     public void runClient(String[] args) {
 
         try {
-
             Protocol protocol = parseOptions(args);
             if (protocol == Protocol.NONE)
                 return;
@@ -299,21 +298,28 @@ private Element setMainElementAndAddressBasedOnProtocol(Protocol protocol, SSLSt
 
     private Protocol parseOptions(String[] args) {
         String protocolName = (args.length > 0) ? args[0] : "";
-        Protocol protocol = Protocol.NONE;
+        Protocol protocol;
 
         Option[] options;
-        if (protocolName.equals("vnc")) {
-            protocol = Protocol.VNC;
-            options = join(commonOptions, vncOptions);
-        } else if (protocolName.equals("rdp")) {
-            protocol = Protocol.RDP;
-            options = join(commonOptions, rdpOptions);
-        } else if (protocolName.equals("hyperv")) {
-            protocol = Protocol.HYPERV;
-            options = join(commonOptions, hyperVOptions);
-        } else {
-            help();
-            return Protocol.NONE;
+        try {
+            protocol = Protocol.valueOf(protocolName);
+        } catch (IllegalArgumentException e) {
+            protocol = Protocol.NONE;
+        }
+
+        switch (protocol) {
+            case VNC:
+                options = join(commonOptions, vncOptions);
+                break;
+            case RDP:
+                options = join(commonOptions, rdpOptions);
+                break;
+            case HYPERV:
+                options = join(commonOptions, hyperVOptions);
+                break;
+            default:
+                help();
+                return Protocol.NONE;
         }
 
         // Parse all options for given protocol