diff --git a/pom.xml b/pom.xml
index 61a79ea..8872b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.zivilon</groupId>
   <artifactId>ItemSalvage</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
   <packaging>jar</packaging>
 
   <name>ItemSalvage</name>
diff --git a/src/main/java/com/zivilon/itemsalvage/listeners/enchantment_table_listener.java b/src/main/java/com/zivilon/itemsalvage/listeners/enchantment_table_listener.java
index 851a372..69263fb 100644
--- a/src/main/java/com/zivilon/itemsalvage/listeners/enchantment_table_listener.java
+++ b/src/main/java/com/zivilon/itemsalvage/listeners/enchantment_table_listener.java
@@ -281,12 +281,16 @@ public class enchantment_table_listener implements Listener {
         // Add meta to the upgraded item
         ItemMeta meta = item.getItemMeta();
         if (!default_name) {
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));            
+            if (name != null)
+                meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));
         } else {
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', original_name));            
+            if (original_name != null)
+                meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', original_name));
+        }
+        if (lore != null) {
+            lore = lore.stream().map(s -> ChatColor.translateAlternateColorCodes('&', s)).collect(Collectors.toList());
+            meta.setLore(lore);
         }
-        lore = lore.stream().map(s -> ChatColor.translateAlternateColorCodes('&', s)).collect(Collectors.toList());
-        meta.setLore(lore);
         item.setItemMeta(meta);
 
         // Fetch the enchantments directly from the upgraded item data and add to the item