diff --git a/src/commands/ship.js b/src/commands/ship.js
index cd62b5d..2b21d0d 100644
--- a/src/commands/ship.js
+++ b/src/commands/ship.js
@@ -12,11 +12,15 @@ exports.run = async (client, message, args) => {
   ]
 
   if (!args[0]) {
-    return message.channel.send(client.userError(exports, 'Missing argument, the `name1` argument is required!'))
+    return message.channel.send(
+      `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get(`ship`).help.usage}\``
+    );
   }
 
   if (!args[1]) {
-    return message.channel.send(client.userError(exports, 'Missing argument, the `name2` argument is required!'))
+    return message.channel.send(
+      `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get(`ship`).help.usage}\``
+    );
   }
 
   const firstName = args[0]
diff --git a/src/events/messageDelete.js b/src/events/messageDelete.js
index c697f3e..97a424a 100644
--- a/src/events/messageDelete.js
+++ b/src/events/messageDelete.js
@@ -3,6 +3,8 @@ const Discord = require("discord.js");
 module.exports = (client, message) => {
   if (message.author.bot) return;
 
+  if(!message.guild) return;
+
   const settings = (message.settings = client.getSettings(message.guild.id));
 
   if (settings.chatlogsChannel !== "off") {
diff --git a/src/events/messageUpdate.js b/src/events/messageUpdate.js
index c6aa6e8..bd33ef9 100644
--- a/src/events/messageUpdate.js
+++ b/src/events/messageUpdate.js
@@ -13,6 +13,7 @@ module.exports = (client, omsg, nmsg) => {
     );
 
     if (channel) {
+      if (!nmsg.member) return;
       let embed = new Discord.MessageEmbed();
       embed.setColor("#fff937");
       embed.setAuthor("Message Edited!", nmsg.member.user.avatarURL({dynamic: true}));