diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java
index bcee1455..8ab8dbea 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java
@@ -73,6 +73,11 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
     @Override
     public U addEnchantment(@NotNull final Enchantment enchantment,
                             final int level) {
+        //noinspection ConstantConditions
+        if (enchantment == null) {
+            return (U) this;
+        }
+
         meta.addEnchant(enchantment, level, true);
         return (U) this;
     }
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt
index ae6613f6..d0521cd6 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt
@@ -114,7 +114,9 @@ class MySQLDataHandler(
     }
 
     private fun getPlayer(uuid: UUID): ResultRow {
-        val player = Players.select { Players.id eq uuid }.limit(1).singleOrNull()
+        val player = transaction {
+            Players.select { Players.id eq uuid }.limit(1).singleOrNull()
+        }
 
         return if (player != null) {
             player