diff --git a/pom.xml b/pom.xml
index ea1bdf2..e954e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.8.4</version>
+    <version>1.8.5</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
diff --git a/src/main/java/lol/hyper/toolstats/events/CraftItem.java b/src/main/java/lol/hyper/toolstats/events/CraftItem.java
index 30780e6..17f05b4 100644
--- a/src/main/java/lol/hyper/toolstats/events/CraftItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/CraftItem.java
@@ -64,7 +64,7 @@ public class CraftItem implements Listener {
 
         // if the player shift clicks, send them this warning
         if (event.isShiftClick()) {
-            Component component = toolStats.configTools.formatLore("shift-click-warning", null, null);
+            Component component = toolStats.configTools.formatLore("shift-click-warning.crafting", null, null);
             event.getWhoClicked().sendMessage(component);
         }
 
diff --git a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
index 00c210b..4eef005 100644
--- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
+++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
@@ -69,10 +69,8 @@ public class VillagerTrade implements Listener {
                 }
                 // if the player shift clicks, show the warning
                 if (event.isShiftClick()) {
-                    String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
-                    if (configMessage != null) {
-                        player.sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                    }
+                    Component component = toolStats.configTools.formatLore("shift-click-warning.trading", null, null);
+                    event.getWhoClicked().sendMessage(component);
                 }
                 ItemStack newItem = addLore(item, player);
                 if (newItem != null) {
diff --git a/src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java b/src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java
index e6c83bb..d556bc5 100644
--- a/src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java
@@ -107,7 +107,9 @@ public class ConfigTools {
         Component component;
 
         // set the placeholder to the value
-        lore = lore.replace(placeHolder, String.valueOf(value));
+        if (placeHolder != null && value != null) {
+            lore = lore.replace(placeHolder, String.valueOf(value));
+        }
 
         // if we match the old color codes, then format them as so
         Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(lore);