1 files changed, 3 insertions, 0 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 4b579ddbdb..a5e146c945 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2409,6 +2409,9 @@ DEFUN (vtysh_write_terminal_daemon,
 	break;
     }
 
+  if (i == array_size(vtysh_client))
+    return CMD_ERR_NO_MATCH;
+
   ret = vtysh_client_execute(&vtysh_client[i], "show running-config\n", stdout);
 
   return ret;