diff --git a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java
index 803221fb..d2a1d17d 100644
--- a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java
+++ b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java
@@ -106,8 +106,7 @@ public final boolean isCommandRegistrationAllowed() {
     private void registerDefaultExceptionHandlers() {
         this.registerDefaultExceptionHandlers(
             triplet -> {
-                final CommandSender commandSender = triplet.first().inject(CommandSender.class)
-                    .orElseThrow(NullPointerException::new);
+                final CommandSender commandSender = this.senderMapper().reverse(triplet.first().sender());
                 final String message = triplet.first().formatCaption(triplet.second(), triplet.third());
                 commandSender.sendMessage(TextFormat.RED + message);
             },
diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java
index 6421df46..a69c0c9e 100644
--- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java
+++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java
@@ -171,7 +171,7 @@ public final boolean hasBrigadierManager() {
     private void registerDefaultExceptionHandlers() {
         this.registerDefaultExceptionHandlers(
             triplet -> {
-                final CommandSource source = triplet.first().inject(CommandSource.class).orElseThrow(NullPointerException::new);
+                final CommandSource source = this.senderMapper().reverse(triplet.first().sender());
                 final String message = triplet.first().formatCaption(triplet.second(), triplet.third());
                 source.sendMessage(Component.text(message, NamedTextColor.RED));
             },