diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index bd2eac988..f1e2d4911 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -879,7 +879,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
      * Returns the {@link ItemStack} in the main hand or off-hand. If the main hand is empty then the offhand item is returned - also nullable.
      */
     public ItemStack getItemInHand() {
-        if (ReflUtil.getNmsVersionObject().isLowerThan(ReflUtil.V1_9_R1)) {
+        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
             return getBase().getInventory().getItemInHand();
         } else {
             PlayerInventory inventory = getBase().getInventory();
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
index c2860e052..65dfabed9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
@@ -44,7 +44,7 @@ public class Commandfirework extends EssentialsCommand {
 
     @Override
     protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
-        final ItemStack stack = user.getBase().getInventory().getItemInMainHand();
+        final ItemStack stack = user.getItemInHand();
         if (MaterialUtil.isFirework(stack.getType())) {
             if (args.length > 0) {
                 if (args[0].equalsIgnoreCase("clear")) {
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java b/Essentials/src/com/earth2me/essentials/commands/Commandhat.java
index 662a57cd0..4ba918945 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhat.java
@@ -33,8 +33,8 @@ public class Commandhat extends EssentialsCommand {
                 user.sendMessage(tl("hatRemoved"));
             }
         } else {
-            if (user.getBase().getInventory().getItemInMainHand().getType() != Material.AIR) {
-                final ItemStack hand = user.getBase().getInventory().getItemInMainHand();
+            final ItemStack hand = user.getItemInHand();
+            if (hand != null && hand.getType() != Material.AIR) {
                 if (hand.getType().getMaxDurability() == 0) {
                     final PlayerInventory inv = user.getBase().getInventory();
                     final ItemStack head = inv.getHelmet();
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
index 4429b07a6..5bf9dffeb 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
@@ -24,7 +24,7 @@ public class Commanditemdb extends EssentialsCommand {
         if (args.length < 1) {
             if (sender.isPlayer() && sender.getPlayer() != null) {
                 itemHeld = true;
-                itemStack = sender.getPlayer().getInventory().getItemInMainHand();
+                itemStack = ess.getUser(sender.getPlayer()).getItemInHand();
             }
             if (itemStack == null) {
                 throw new NotEnoughArgumentsException();
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java b/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
index 7af91bfdb..2109d176b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
@@ -16,7 +16,7 @@ public class Commandmore extends EssentialsCommand {
 
     @Override
     public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
-        final ItemStack stack = user.getBase().getInventory().getItemInMainHand();
+        final ItemStack stack = user.getItemInHand();
         if (stack == null) {
             throw new Exception(tl("cantSpawnItem", "Air"));
         }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index ccf4cd1e5..174119ed5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -39,7 +39,7 @@ public class Commandrepair extends EssentialsCommand {
     }
 
     public void repairHand(User user) throws Exception {
-        final ItemStack item = user.getBase().getInventory().getItemInMainHand();
+        final ItemStack item = user.getItemInHand();
         if (item == null || item.getType().isBlock() || item.getDurability() == 0) {
             throw new Exception(tl("repairInvalidType"));
         }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java b/Essentials/src/com/earth2me/essentials/commands/Commandskull.java
index e0be7058b..5cb06a865 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandskull.java
@@ -36,7 +36,7 @@ public class Commandskull extends EssentialsCommand {
             owner = user.getName();
         }
 
-        ItemStack itemSkull = user.getBase().getInventory().getItemInMainHand();
+        ItemStack itemSkull = user.getItemInHand();
         SkullMeta metaSkull = null;
         boolean spawn = false;
 
diff --git a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java
index b0a919eb8..0101f7db2 100644
--- a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java
+++ b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java
@@ -12,6 +12,7 @@ import java.util.regex.Pattern;
 public class VersionUtil {
 
     public static final BukkitVersion v1_8_8_R01 = BukkitVersion.fromString("1.8.8-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_9_R01 = BukkitVersion.fromString("1.9-R0.1-SNAPSHOT");
     public static final BukkitVersion v1_9_4_R01 = BukkitVersion.fromString("1.9.4-R0.1-SNAPSHOT");
     public static final BukkitVersion v1_10_2_R01 = BukkitVersion.fromString("1.10.2-R0.1-SNAPSHOT");
     public static final BukkitVersion v1_11_2_R01 = BukkitVersion.fromString("1.11.2-R0.1-SNAPSHOT");