diff --git a/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java b/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
index adf1b9c..d31f937 100644
--- a/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
+++ b/SpigotCore_14/src/de/steamwar/inventory/SWItem_14.java
@@ -19,7 +19,9 @@
 
 package de.steamwar.inventory;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
@@ -269,7 +271,12 @@ class SWItem_14 {
         ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
         SkullMeta headmeta = (SkullMeta) head.getItemMeta();
         assert headmeta != null;
-        headmeta.setOwner(player);
+        Player p = Bukkit.getPlayer(player);
+        if (p != null) {
+            headmeta.setOwningPlayer(p);
+        } else {
+            headmeta.setOwner(player);
+        }
         headmeta.setDisplayName(player);
         head.setItemMeta(headmeta);
         return head;