diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandvanish.java
index 3c31bc14c1b..7c66d26d0c1 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandvanish.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandvanish.java
@@ -27,7 +27,7 @@ protected void togglePlayer(final CommandSource sender, final User user, Boolean
             enabled = !user.isVanished();
         }
 
-        final VanishStatusChangeEvent vanishEvent = new VanishStatusChangeEvent(sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null, user, enabled);
+        final VanishStatusChangeEvent vanishEvent = new VanishStatusChangeEvent(user, sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null, enabled);
         ess.getServer().getPluginManager().callEvent(vanishEvent);
         if (vanishEvent.isCancelled()) {
             return;
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
index c5dc69a6bb1..bee4d6a546c 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
@@ -126,6 +126,9 @@ public boolean isSilentJoinQuit(final IUser user, final String type) {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onVanishStatusChange(VanishStatusChangeEvent event) {
+        if (event.getAffected() == null) {
+            return;
+        }
         if (!jda.getSettings().isVanishFakeJoinLeave() || event.getAffected().isLeavingHidden()) {
             return;
         }