diff --git a/server.js b/server.js
index a319ed5..da15354 100644
--- a/server.js
+++ b/server.js
@@ -73,16 +73,20 @@ client.on('message', message => {
       logger.info(`${message.author.username} ${message.author} [Channel: ${message.channel}] triggered command: ${message.content}`);
       message.delete();
 
-      if (cachedModuleType == 'Command') {
-        cachedModule.command(message);
-      } else if (cachedModuleType == 'Quote') {
-        cachedModules['quote.js'].command(message, cachedModule.reply);
-      }
+      try {
+        if (cachedModuleType == 'Command') {
+          cachedModule.command(message);
+        } else if (cachedModuleType == 'Quote') {
+          cachedModules['quote.js'].command(message, cachedModule.reply);
+        }
+      } catch (err) { logger.error(err); }
 
-      // Check if the command requires a warning.
-      if (cmd != 'warn' && cachedModule.warn == true) {
-        cachedModules['warn.js'].command(message);
-      }
+      try {
+        // Check if the command requires a warning.
+        if (cmd != 'warn' && cachedModule.warn == true) {
+          cachedModules['warn.js'].command(message);
+        }
+      } catch (err) { logger.error(err); }
     } else {
       // Not a valid command.
     }
@@ -91,7 +95,9 @@ client.on('message', message => {
     cachedTriggers.forEach(function(trigger) {
         if (trigger.roles == undefined || findArray(message.member.roles.map(function(x) { return x.name; }), trigger.roles)) {
           if (trigger.trigger(message) == true) {
-              trigger.execute(message);
+              try {
+                trigger.execute(message);
+              } catch (err) { logger.error(err); }
           }
         }
     });