diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt
index 2f5b6494b..ae725bdca 100644
--- a/buildSrc/src/main/kotlin/PlatformConfig.kt
+++ b/buildSrc/src/main/kotlin/PlatformConfig.kt
@@ -54,10 +54,10 @@ fun Project.applyPlatformAndCoreConfiguration() {
         "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.2")
         "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.7.2")
-        "testImplementation"("org.mockito:mockito-core:3.11.2")
-        "testImplementation"("org.mockito:mockito-junit-jupiter:3.11.2")
+        "testImplementation"("org.mockito:mockito-core:3.12.4")
+        "testImplementation"("org.mockito:mockito-junit-jupiter:3.12.4")
         "testImplementation"("net.bytebuddy:byte-buddy:1.11.9")
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:3.11.2")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:3.12.4")
     }
 
     // Java 8 turns on doclint which we fail
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4cc7085b9..bd466e47d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ text = "3.0.4"
 piston = "0.5.7"
 
 # Tests
-mockito = "3.11.2"
+mockito = "3.12.4"
 checker-qual = "3.16.0"
 
 # Gradle plugins
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
index 0f5a785c4..f131b052a 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
@@ -874,7 +874,9 @@ public final class PlatformCommandManager {
     private void handleUnknownException(Actor actor, Throwable t) {
         actor.print(Caption.of("worldedit.command.error.report"));
         actor.print(TextComponent.of(t.getClass().getName() + ": " + t.getMessage()));
-        LOGGER.error("An unexpected error while handling a WorldEdit command", t);
+        //FAWE start - Exchange name
+        LOGGER.error("An unexpected error while handling a FastAsyncWorldEdit command", t);
+        //FAWE end
     }
 
     @Subscribe