diff --git a/README.md b/README.md
index ef2c12b40..a9a44d96d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ For more information, see the wiki article on [Why LuckPerms?](https://github.co
 
 ## Useful Links
 The latest downloads & other useful links can be found on the project homepage at [luckperms.net](https://luckperms.net/).
-The latest **downloads** can be found on the [project's homepage](https://luckperms.net/).
 
 ## Building
 LuckPerms uses Gradle to handle dependencies & building.
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java
index 6f686ad19..2708730f3 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitCommandListUpdater.java
@@ -78,6 +78,10 @@ public class BukkitCommandListUpdater {
 
     // Called when the buffer times out.
     private void sendUpdate(UUID uniqueId) {
+        if (this.plugin.getBootstrap().isServerStopping()) {
+            return;
+        }
+        
         this.plugin.getBootstrap().getScheduler().sync().execute(() -> {
             Player player = this.plugin.getBootstrap().getPlayer(uniqueId).orElse(null);
             if (player != null) {