diff --git a/src/main/java/com/alttd/playershops/gui/ListShopsGui.java b/src/main/java/com/alttd/playershops/gui/ListShopsGui.java
index 7327cac..6fb329f 100644
--- a/src/main/java/com/alttd/playershops/gui/ListShopsGui.java
+++ b/src/main/java/com/alttd/playershops/gui/ListShopsGui.java
@@ -55,7 +55,7 @@ public class ListShopsGui extends AbstractGui {
         for (int i = startIndex; i < shops.size(); i++) {
             PlayerShop shop = shops.get(i);
             ItemStack item = shop.getItemStack();
-            if (!shop.isInitialized())
+            if (!shop.isInitialized() || item == null)
                 item = GuiIcon.EMPTY_SHOP.getItemStack();
 
             if (!addItem(item)) {
diff --git a/src/main/java/com/alttd/playershops/listener/TransactionListener.java b/src/main/java/com/alttd/playershops/listener/TransactionListener.java
index be5d0a9..df45a54 100644
--- a/src/main/java/com/alttd/playershops/listener/TransactionListener.java
+++ b/src/main/java/com/alttd/playershops/listener/TransactionListener.java
@@ -153,7 +153,7 @@ public class TransactionListener extends EventListener {
         TagResolver placeholders = TagResolver.resolver(action,
                 Placeholder.parsed("amount", "" + playerShop.getAmount()),
                 Placeholder.component("item", ShopUtil.itemNameComponent(playerShop.getItemStack())),
-                Placeholder.parsed("material", Util.capitalize(playerShop.getItemStack().getType().name())),
+                Placeholder.component("material", ShopUtil.trimmedItemNameComponent(playerShop.getItemStack())),
                 Placeholder.parsed("price", "" + ShopUtil.round(playerShop.getPrice()))
         );
 
diff --git a/src/main/java/com/alttd/playershops/shop/PlayerShop.java b/src/main/java/com/alttd/playershops/shop/PlayerShop.java
index d3f898b..95af72e 100644
--- a/src/main/java/com/alttd/playershops/shop/PlayerShop.java
+++ b/src/main/java/com/alttd/playershops/shop/PlayerShop.java
@@ -313,7 +313,7 @@ public class PlayerShop {
     }
 
     private TransactionError executeGambleTransaction(Player player) {
-        ItemStack itemStack = getRandomItem();
+        ItemStack itemStack = getItemStack();
         if (itemStack == null)
             return TransactionError.INSUFFICIENT_FUNDS_SHOP;
 
@@ -419,9 +419,11 @@ public class PlayerShop {
         transactions.add(transaction);
     }
 
-    private ItemStack getRandomItem() {
+    public ItemStack getItemStack() {
         if (!isInitialized())
             return null;
+        if (this.getType() != ShopType.GAMBLE)
+            return itemStack;
         if (this.getInventory().isEmpty())
             return null;
         ArrayList<ItemStack> contents = new ArrayList<>();