diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b3de034a68..a838dfe290 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1484,7 +1484,7 @@ public final class CraftServer implements Server {
 
     @Override
     public Merchant createMerchant(String title) {
-        return new CraftMerchantCustom(title);
+        return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
     }
 
     @Override