X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand.c;h=4dd9a23e8bda4b9bc6f6e771406a31e6e51ab1bd;hb=b4f6d2b07c10aba0273801f79ef5f4eccae2973b;hp=0f706c350181071facfe95ea16b6566102ad1907;hpb=12bec955584a6a74af2972814b1a44ab2ead3dfe;p=silc.git

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index 0f706c35..4dd9a23e 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -1181,10 +1181,22 @@ SILC_CLIENT_CMD_FUNC(names)
     goto out;
   }
 
-  if (cmd->argv[1][0] == '*')
+  if (cmd->argv[1][0] == '*') {
+    if (!conn->current_channel) {
+      cmd->client->ops->say(cmd->client, conn, "You are not on any channel");
+      COMMAND_ERROR;
+      goto out;
+    }
     name = conn->current_channel->channel_name;
-  else
+  } else {
     name = cmd->argv[1];
+  }
+
+  if (!conn->current_channel) {
+    cmd->client->ops->say(cmd->client, conn, "You are not on that channel");
+    COMMAND_ERROR;
+    goto out;
+  }
 
   /* Get the Channel ID of the channel */
   if (!silc_idcache_find_by_data_one(conn->channel_cache, name, &id_cache)) {