diff --git a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
index be3ea21e..4cc74d35 100644
--- a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
+++ b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
@@ -60,11 +60,12 @@ public abstract class EntityMixin {
         }
 
         ItemStack itemStack = itemEntity.getStack();
-        if (!itemStack.isOf(SKELETON_SKULL) && !itemStack.isOf(WITHER_SKELETON_SKULL)) {
+        Text returnValue = cir.getReturnValue();
+        if (returnValue == null || (!itemStack.isOf(SKELETON_SKULL) && !itemStack.isOf(WITHER_SKELETON_SKULL))) {
             return;
         }
 
-        String displayNameString = cir.getReturnValue().getString();
+        String displayNameString = returnValue.getString();
 
         // extract player name (✟RettichLP -> RettichLP)
         String playerName = displayNameString.substring(1);
diff --git a/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java
index b1237a72..3ec84432 100644
--- a/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java
+++ b/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java
@@ -24,7 +24,7 @@
 public class PlayerEntityMixin {
 
     @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true)
-    private void ucutils$getDisplayName(@NotNull CallbackInfoReturnable<Text> cir) {
+    private void ucutils$getDisplayNameReturn(@NotNull CallbackInfoReturnable<Text> cir) {
         GameProfile gameProfile = ((PlayerEntity) (Object) this).getGameProfile();
         cir.setReturnValue(factionService.getEnrichedDisplayName(gameProfile.name()));
     }