diff --git a/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java b/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java
index 622de0c3..a0347524 100644
--- a/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java
+++ b/src/main/java/carpet/mixins/ClientPlayerEntity_clientCommandMixin.java
@@ -13,7 +13,8 @@ public class ClientPlayerEntity_clientCommandMixin
     @Inject(method = "sendChatMessage", at = @At("HEAD"))
     private void inspectMessage(String string, CallbackInfo ci)
     {
+        ClientPlayerEntity playerSource = (ClientPlayerEntity)(Object) this;
         if (CarpetServer.minecraft_server == null)
-            CarpetServer.settingsManager.inspectClientsideCommand(string);
+            CarpetServer.settingsManager.inspectClientsideCommand(playerSource.getCommandSource(), string);
     }
 }
diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java
index 10064283..b8d5c436 100644
--- a/src/main/java/carpet/settings/SettingsManager.java
+++ b/src/main/java/carpet/settings/SettingsManager.java
@@ -571,7 +571,7 @@ public class SettingsManager
         return 1;
     }
 
-    public void inspectClientsideCommand(String string)
+    public void inspectClientsideCommand(ServerCommandSource source, String string)
     {
         if (string.startsWith("/carpet "))
         {
@@ -582,7 +582,7 @@ public class SettingsManager
                 String strOption = res[2];
                 if (rules.containsKey(setting) && rules.get(setting).isClient)
                 {
-                    rules.get(setting).set(null, strOption);
+                    rules.get(setting).set(source, strOption);
                 }
             }
 
diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java
index 49a59c78..9db5cbb5 100644
--- a/src/main/java/carpet/utils/Messenger.java
+++ b/src/main/java/carpet/utils/Messenger.java
@@ -252,7 +252,7 @@ public class Messenger
     //message source
     public static void m(ServerCommandSource source, Object ... fields)
     {
-        source.sendFeedback(Messenger.c(fields),source.getMinecraftServer().getWorld(DimensionType.OVERWORLD_REGISTRY_KEY) != null); //OW
+        source.sendFeedback(Messenger.c(fields),source.getMinecraftServer() != null && source.getMinecraftServer().getWorld(DimensionType.OVERWORLD_REGISTRY_KEY) != null); //OW
     }
     public static void m(PlayerEntity player, Object ... fields)
     {