diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts
index 65e3ba0..52fe1e7 100644
--- a/src/commands/timeout.ts
+++ b/src/commands/timeout.ts
@@ -49,6 +49,11 @@ export default class Timeout extends Command {
             return;
         }
 
+        if (targetUser.user.bot) {
+            await interaction.reply('Cannot timeout bots.');
+            return;
+        }
+
         // General Variables
         const targetMember = targetUser.member as GuildMember;
         const reason = reasonInput && reasonInput.value ? reasonInput.value.toString() : null;
diff --git a/src/helpers/StringTools.ts b/src/helpers/StringTools.ts
index 5119f94..0254dc5 100644
--- a/src/helpers/StringTools.ts
+++ b/src/helpers/StringTools.ts
@@ -35,4 +35,8 @@ export default class StringTools {
 
         return result;
     }
+
+    public static ReplaceAll(str: string, find: string, replace: string) {
+        return str.replace(new RegExp(find, 'g'), replace);
+    }
 }
\ No newline at end of file
diff --git a/src/helpers/TimeLengthInput.ts b/src/helpers/TimeLengthInput.ts
index 7c167d2..95befa6 100644
--- a/src/helpers/TimeLengthInput.ts
+++ b/src/helpers/TimeLengthInput.ts
@@ -1,8 +1,10 @@
+import StringTools from "./StringTools";
+
 export default class TimeLengthInput {
     public readonly value: string;
 
     constructor(input: string) {
-        this.value = input;
+        this.value = StringTools.ReplaceAll(input, ',', '');
     }
 
     public GetDays(): number {
diff --git a/src/vylbot.ts b/src/vylbot.ts
index c1d2997..668c8e5 100644
--- a/src/vylbot.ts
+++ b/src/vylbot.ts
@@ -35,4 +35,4 @@ const client = new CoreClient([
 registry.RegisterCommands();
 registry.RegisterEvents();
 
-client.start();
\ No newline at end of file
+client.start();
diff --git a/tests/commands/timeout.test.ts b/tests/commands/timeout.test.ts
index c64ceb5..1646734 100644
--- a/tests/commands/timeout.test.ts
+++ b/tests/commands/timeout.test.ts
@@ -360,6 +360,43 @@ describe('execute', () => {
         expect(interaction.reply).toBeCalledWith('Fields are required.');
     });
 
+    test('GIVEN targetUser is a bot, EXPECT error', async () => {
+        const interaction = {
+            reply: jest.fn(),
+            guild: mock<Guild>(),
+            guildId: 'guildId',
+            options: {
+                get: jest.fn((value: string): CommandInteractionOption<CacheType> | null => {
+                    switch (value) {
+                        case 'target':
+                            return {
+                                user: {
+                                    bot: true,
+                                } as User,
+                                member: {} as GuildMember
+                            } as CommandInteractionOption;
+                        case 'length':
+                            return {
+                                value: '1m',
+                            } as CommandInteractionOption;
+                        case 'reason':
+                            return {
+                                value: 'Test reason',
+                            } as CommandInteractionOption;
+                        default:
+                            return null;
+                    }
+                }),
+            }
+        } as unknown as CommandInteraction;
+
+        const command = new Timeout();
+
+        await command.execute(interaction);
+
+        expect(interaction.reply).toBeCalledWith('Cannot timeout bots.');
+    });
+
     test('GIVEN targetMember IS NOT manageable by the bot, EXPECT insufficient permissions error', async () => {
         const command = new Timeout();