automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11306 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 1 deletions

diff --git a/cli.c b/cli.c
index 4a0f95e54..e2a646d5b 100644
--- a/cli.c
+++ b/cli.c
@@ -1363,7 +1363,10 @@ int ast_cli_command(int fd, char *s)
 			if (e) {
 				switch(e->handler(fd, x, argv)) {
 				case RESULT_SHOWUSAGE:
-					ast_cli(fd, "%s", e->usage);
+					if (e->usage)
+						ast_cli(fd, "%s", e->usage);
+					else
+						ast_cli(fd, "%s", "Invalid usage, but no usage information available.\n");
 					break;
 				}
 			} else