diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index f47a36236..6623ae127 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -566,7 +566,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
     }
 
     public final void setDisplayName(String name) {
-        this.displayName = (name == null) ? null : new ChatComponentText(name);
+        this.displayName = CraftChatMessage.wrapOrNull(name);
     }
 
     public boolean hasDisplayName() {
@@ -580,7 +580,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
 
     @Override
     public void setLocalizedName(String name) {
-        this.locName = (name == null) ? null : new ChatComponentText(name);
+        this.locName = CraftChatMessage.wrapOrNull(name);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index 9b62ed436..299b9a287 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -138,6 +138,10 @@ public final class CraftChatMessage {
         }
     }
 
+    public static IChatBaseComponent wrapOrNull(String message) {
+        return (message == null || message.isEmpty()) ? null : new ChatComponentText(message);
+    }
+
     public static IChatBaseComponent fromStringOrNull(String message) {
         return (message == null || message.isEmpty()) ? null : fromString(message)[0];
     }