diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
index 7df8db4c4a..fc80f5a9bb 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
@@ -269,9 +269,8 @@ class SshLog implements LifecycleListener {
 
   private String extractWhat(DispatchCommand dcmd) {
     String commandName = dcmd.getCommandName();
-    String[] args = dcmd.getArguments();
-    if (args.length > 1) {
-      return commandName + "." + args[1];
+    for (String arg : dcmd.getArguments()) {
+      commandName = commandName + "." + arg;
     }
     return commandName;
   }