X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand.c;h=1485c2bf08deb74f69491a080aff31a849b9e499;hb=7a5324e0f2a3ab8bc269bb1417134f8db4968b59;hp=0164d7642a3d5e16d9d0f5b96588d7c98b01cddb;hpb=5abf57fab042a9f9e4ea497cea5cdf6bb170ef62;p=silc.git

diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c
index 0164d764..1485c2bf 100644
--- a/lib/silcclient/command.c
+++ b/lib/silcclient/command.c
@@ -367,6 +367,9 @@ SILC_CLIENT_CMD_FUNC(nick_change)
     if (conn->nickname)
       silc_free(conn->nickname);
     conn->nickname = strdup(cmd->argv[1]);
+    COMMAND;
+  } else {
+    COMMAND_ERROR;
   }
 
   silc_client_command_free(cmd);
@@ -433,10 +436,8 @@ SILC_CLIENT_CMD_FUNC(nick)
 			      silc_client_command_destructor,
 			      silc_client_command_nick_change,
 			      silc_client_command_dup(cmd));
-  cmd->pending = 1;
-
-  /* Notify application */
-  COMMAND;
+  cmd->pending = TRUE;
+  return;
 
  out:
   silc_client_command_free(cmd);