diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e902fb..8ae1859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@
 * Initial release
 
 ## PvP Leaderboard
+### v1.0.2
+* Fixed an issue with commands that lookup players by name
+
 ### v1.0.1
 * Fixed the logging of the incorrect current level in the grief-kill log (it logged the killer's lvl instead of the victim's)
 
@@ -32,6 +35,9 @@
 * Initial release
 
 ## PvP Punishment
+### v1.0.4
+* Fixed an issue with commands that lookup players by name
+
 ### v1.0.3
 * Added a new config option to announce a grief-kill (exactly the same as the PvP Leaderboard mod v1.0.1)
 
@@ -52,5 +58,8 @@
 * Initial release
 
 ## Generic Chat Commands
+### v1.0.1
+* Fixed an issue with commands that lookup players by name
+
 ### v1.0.0
 * Initial release
diff --git a/GenericChatCommands/GenericChatCommands.csproj b/GenericChatCommands/GenericChatCommands.csproj
index b379c58..dcf09ef 100644
--- a/GenericChatCommands/GenericChatCommands.csproj
+++ b/GenericChatCommands/GenericChatCommands.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>VMods.GenericChatCommands</AssemblyName>
     <RootNamespace>VMods.GenericChatCommands</RootNamespace>
     <Description>A mod that adds a number of generic/general usage commands</Description>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
diff --git a/PvPLeaderboard/PvPLeaderboard.csproj b/PvPLeaderboard/PvPLeaderboard.csproj
index 8d771d8..005f2c5 100644
--- a/PvPLeaderboard/PvPLeaderboard.csproj
+++ b/PvPLeaderboard/PvPLeaderboard.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>VMods.PvPLeaderboard</AssemblyName>
     <RootNamespace>VMods.PvPLeaderboard</RootNamespace>
     <Description>A mod that keeps track of player's K/D and adds a pvp leaderboard</Description>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
diff --git a/PvPPunishment/PvPPunishment.csproj b/PvPPunishment/PvPPunishment.csproj
index f3d6947..09554f7 100644
--- a/PvPPunishment/PvPPunishment.csproj
+++ b/PvPPunishment/PvPPunishment.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>VMods.PvPPunishment</AssemblyName>
     <RootNamespace>VMods.PvPPunishment</RootNamespace>
     <Description>A mod that punishes high-level players that kill low-level players</Description>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
diff --git a/Shared/VModCharacter.cs b/Shared/VModCharacter.cs
index c4b65bc..c231a0a 100644
--- a/Shared/VModCharacter.cs
+++ b/Shared/VModCharacter.cs
@@ -87,11 +87,19 @@ public VModCharacter(Entity userEntity, Entity charEntity, EntityManager? entity
 			foreach(var userEntity in users)
 			{
 				var userData = entityManager.Value.GetComponentData<User>(userEntity);
-				var playerCharacter = entityManager.Value.GetComponentData<PlayerCharacter>(userData.LocalCharacter._Entity);
-				if(userData.CharacterName.ToString() == charactername)
+				if(userData.CharacterName.ToString() != charactername)
 				{
-					return new VModCharacter(userData, playerCharacter);
+					continue;
 				}
+
+				var characterEntity = userData.LocalCharacter._Entity;
+				if(!entityManager.Value.HasComponent<PlayerCharacter>(characterEntity))
+				{
+					continue;
+				}
+
+				var playerCharacter = entityManager.Value.GetComponentData<PlayerCharacter>(characterEntity);
+				return new VModCharacter(userData, playerCharacter);
 			}
 			return null;
 		}
diff --git a/Thunderstore/GenericChatCommands/manifest.json b/Thunderstore/GenericChatCommands/manifest.json
index 2580901..b44978f 100644
--- a/Thunderstore/GenericChatCommands/manifest.json
+++ b/Thunderstore/GenericChatCommands/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "VMods_Generic_Chat_Commands",
   "description": "A mod that adds a fair amount of generic chat commands (mostly for Mods & Admins only though) and a player chat muting system.",
-  "version_number": "1.0.0",
+  "version_number": "1.0.1",
   "dependencies": [
     "BepInEx-BepInExPack_V_Rising-1.0.0",
     "molenzwiebel-Wetstone-1.1.0"
diff --git a/Thunderstore/PvPLeaderboard/manifest.json b/Thunderstore/PvPLeaderboard/manifest.json
index 876aa6a..6d3a407 100644
--- a/Thunderstore/PvPLeaderboard/manifest.json
+++ b/Thunderstore/PvPLeaderboard/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "VMods_PvP_Leaderboard",
   "description": "A mod that keeps track of Kills, Death and the K/D ratio of players and ranks them in a leaderboard.",
-  "version_number": "1.0.1",
+  "version_number": "1.0.2",
   "dependencies": [
     "BepInEx-BepInExPack_V_Rising-1.0.0",
     "molenzwiebel-Wetstone-1.1.0"
diff --git a/Thunderstore/PvPPunishment/manifest.json b/Thunderstore/PvPPunishment/manifest.json
index 29779d1..6f702a3 100644
--- a/Thunderstore/PvPPunishment/manifest.json
+++ b/Thunderstore/PvPPunishment/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "VMods_PvP_Punishment",
   "description": "A mod that punishes low-level kills.",
-  "version_number": "1.0.3",
+  "version_number": "1.0.4",
   "dependencies": [
     "BepInEx-BepInExPack_V_Rising-1.0.0",
     "molenzwiebel-Wetstone-1.1.0"