diff --git a/src/tcldcc.c b/src/tcldcc.c
index 8c0cfbb3c..1ead56cd6 100644
--- a/src/tcldcc.c
+++ b/src/tcldcc.c
@@ -1353,8 +1353,7 @@ static int tcl_boot STDVAR
   if (strchr(who, '@') != NULL) {
     char whonick[HANDLEN + 1];
 
-    splitc(whonick, who, '@');
-    whonick[HANDLEN] = 0;
+    splitcn(whonick, who, '@', sizeof whonick);
     if (!strcasecmp(who, botnetnick))
       strlcpy(who, whonick, sizeof who);
     else if (remote_boots > 0) {