diff --git a/src/discord/Help.ts b/src/discord/Help.ts
index 1f2f43c..b16ce26 100644
--- a/src/discord/Help.ts
+++ b/src/discord/Help.ts
@@ -7,7 +7,10 @@ const EMBEDS = {
     INFO: async (data: Message | Interaction) => {
 
         let GuildCache = await Cache.getGuild(data.guildId!);
-        //if(typeof GuildCache === 'undefined' || typeof GuildCache.prefix === 'undefined') return;
+
+        // TODO: Better error handling
+        if(typeof GuildCache === 'undefined')
+            throw new Error("Guild not found");
 
         let prefix = GuildCache.prefix || '>';