diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index 5af3794d..9bf44d6d 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -126,7 +126,7 @@ public abstract class AbstractPonyModel extends ModelPlayer {
 
             ItemStack main = clientPlayer.getHeldItemMainhand();
             ArmPose mainPose;
-            if (main == null) {
+            if (main.isEmpty()) {
                 mainPose = ArmPose.EMPTY;
             } else {
                 mainPose = ArmPose.ITEM;
@@ -144,7 +144,7 @@ public abstract class AbstractPonyModel extends ModelPlayer {
 
             ItemStack off = clientPlayer.getHeldItemOffhand();
             ArmPose offPose;
-            if (off == null) {
+            if (off.isEmpty()) {
                 offPose = ArmPose.EMPTY;
             } else {
                 offPose = ArmPose.ITEM;
diff --git a/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java b/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java
index 527bc478..3d6bcde3 100644
--- a/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java
+++ b/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java
@@ -69,7 +69,7 @@ public class LayerHeldPonyItem implements LayerRenderer<EntityLivingBase> {
     }
 
     private void renderHeldItem(EntityLivingBase entity, ItemStack drop, ItemCameraTransforms.TransformType transform, EnumHandSide hand) {
-        if (drop != null) {
+        if (!drop.isEmpty()) {
             GlStateManager.pushMatrix();
             AbstractPonyModel thePony = ((IRenderPony) this.livingPonyEntity).getPony().getModel();
             PonyData metadata = thePony.metadata;