diff --git a/commands/guild-info/server-info.js b/commands/guild-info/server-info.js
index 8f955f16..32c25a62 100644
--- a/commands/guild-info/server-info.js
+++ b/commands/guild-info/server-info.js
@@ -33,7 +33,7 @@ module.exports = class GuildInfoCommand extends Command {
             .addField('❯ Explicit Filter',
                 filterLevels[msg.guild.explicitContentFilter], true)
             .addField('❯ Owner',
-                msg.guild.owner.username, true)
+                msg.guild.owner ? msg.guild.owner.user.username : 'None', true)
             .addField('❯ Members',
                 msg.guild.memberCount, true);
         return msg.embed(embed);
diff --git a/commands/random-res/ship.js b/commands/random-res/ship.js
index 7f3d99ea..609c3654 100644
--- a/commands/random-res/ship.js
+++ b/commands/random-res/ship.js
@@ -4,7 +4,6 @@ module.exports = class ShipCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'ship',
-            aliases: ['rate'],
             group: 'random-res',
             memberName: 'ship',
             description: 'Ships things/people together.',