diff --git a/src/main/java/com/songoda/ultimatekits/UltimateKits.java b/src/main/java/com/songoda/ultimatekits/UltimateKits.java
index 1676eda..05eadf9 100644
--- a/src/main/java/com/songoda/ultimatekits/UltimateKits.java
+++ b/src/main/java/com/songoda/ultimatekits/UltimateKits.java
@@ -175,7 +175,7 @@ public class UltimateKits extends JavaPlugin {
             this.dataManager.getBlockData((blockData) -> {
                 this.kitManager.setKitLocations(blockData);
                 kitManager.getKitLocations().forEach((location, data) -> {
-                    UltimateKits.getInstance().getHologram().add(data);
+                    if (hologram != null) UltimateKits.getInstance().getHologram().add(data);
                 });
             });
         }, 20L);
diff --git a/src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java b/src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java
index 189f2b4..a0d7851 100644
--- a/src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java
+++ b/src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java
@@ -40,6 +40,8 @@ public class DisplayItemHandler {
 
         Kit kit = kitBlockData.getKit();
 
+        if (kit.getReadableContents(null, false, false, false) == null) return;
+
         List<ItemStack> list = kit.getReadableContents(null, false, false, false);
         if (list.isEmpty()) return;
         for (Entity e : location.getChunk().getEntities()) {
diff --git a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java
index 88214f0..1b8966b 100644
--- a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java
+++ b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java
@@ -7,6 +7,7 @@ import com.songoda.ultimatekits.kit.type.KitContentEconomy;
 import com.songoda.ultimatekits.kit.type.KitContentItem;
 import com.songoda.ultimatekits.utils.Methods;
 import com.songoda.ultimatekits.utils.settings.Setting;
+import org.apache.commons.lang.WordUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -156,8 +157,11 @@ public class KitItem {
         ItemStack item = content.getItemForDisplay();
         ItemMeta meta = item.getItemMeta();
         if (chance != 0 || displayItem != null || displayName != null || displayLore != null) {
-            meta.setDisplayName(meta.hasDisplayName() ? Methods.convertToInvisibleString(compileOptions() + ";")
-                    + meta.getDisplayName() : Methods.convertToInvisibleString(compileOptions() + ";faqe") + item.getType().name().replace("_", " "));
+            String capitalizedName = meta.hasDisplayName() ? meta.getDisplayName() :
+                    WordUtils.capitalize(item.getType().toString().toLowerCase().replace("_", " "));
+            if (capitalizedName.contains(Methods.convertToInvisibleString(";faqe")))
+                capitalizedName = meta.getDisplayName().split(Methods.convertToInvisibleString(";faqe"))[1];
+            meta.setDisplayName(Methods.convertToInvisibleString(compileOptions() + ";faqe") + ChatColor.RESET + capitalizedName);
         }
         item.setItemMeta(meta);
         return item;