diff --git a/botthread.c b/botthread.c
index e0cfdf4..ee28e3e 100644
--- a/botthread.c
+++ b/botthread.c
@@ -31,6 +31,9 @@
   cmd     = strtok_r(data," ",&tok_last);
   cmdData = strtok_r(NULL,"\n",&tok_last);
 
+  if (cmd == 0x0)
+    return(0x1);
+
   if (strcasecmp(cmd,"login") == 0x0) {
     tok_last = 0x0;
     tmp = strtok_r(cmdData," ",&tok_last);
diff --git a/channel.c b/channel.c
index 1b5e7e7..6f7934a 100644
--- a/channel.c
+++ b/channel.c
@@ -366,7 +366,7 @@
   sSendData(userConnection,output);
 
   if (tmpChannel->modes[CHAN_TIME] == 1) {
-    sSendData(userConnection,"MSG:TUveD:%s:This channel has a time limit of %i seconds for songs.",tmpChannel->channel,tmpChannel->maxTime);
+    sSendData(userConnection,"MSG:TUveD:%s:This channel has a time limit of %i seconds for videos.",tmpChannel->channel,tmpChannel->maxTime);
     sSendData(userConnection,"MODE:%s:T:1:%i",tmpChannel->channel,tmpChannel->maxTime);
     }
   else {