diff --git a/src/bot.js b/src/bot.js
index ad909db..472bc10 100644
--- a/src/bot.js
+++ b/src/bot.js
@@ -6,6 +6,12 @@ require('@dotenvx/dotenvx').config({ path: "config.env" });
 require('./plugins/ytdlp-wrapper.js');
 // require('./plugins/termlogger.js');
 
+// Ensures bot token is set, and not default value
+if (!process.env.botToken || process.env.botToken === 'InsertYourBotTokenHere') {
+  console.error('Bot token is not set. Please set the bot token in the config.env file.')
+  process.exit(1)
+}
+
 const bot = new Telegraf(process.env.botToken);
 const maxRetries = process.env.maxRetries || 5;
 let restartCount = 0;
diff --git a/src/commands/youtube.js b/src/commands/youtube.js
index 76b0d29..316385b 100644
--- a/src/commands/youtube.js
+++ b/src/commands/youtube.js
@@ -94,6 +94,20 @@ module.exports = (bot) => {
           getApproxSize(ytDlpPath, videoUrl),
         ]);
 
+        if (approxSizeInMB > 50) {
+          await ctx.telegram.editMessageText(
+            ctx.chat.id,
+            downloadingMessage.message_id,
+            null,
+            Strings.ytDownload.uploadLimit, {
+              parse_mode: 'Markdown',
+              reply_to_message_id: ctx.message.message_id,
+            },
+          );
+
+          return;
+        }
+
         await ctx.telegram.editMessageText(
           ctx.chat.id,
           downloadingMessage.message_id,
@@ -134,7 +148,7 @@ module.exports = (bot) => {
             
             fs.unlinkSync(mp4File);
           } catch (error) {
-            if (toString(error).includes("Request Entity Too Large")) {
+            if (error.response.description.includes("Request Entity Too Large")) {
               await ctx.telegram.editMessageText(
                 ctx.chat.id,
                 downloadingMessage.message_id,