diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java
index ee7ac21c2a..97d630e4db 100644
--- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java
+++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java
@@ -253,15 +253,16 @@ public class GuiIngameForge extends GuiIngame
 
         ItemStack itemstack = this.mc.player.inventory.armorItemInSlot(3);
 
-        if (this.mc.gameSettings.thirdPersonView == 0 && itemstack != null && itemstack.getItem() != null)
+        if (this.mc.gameSettings.thirdPersonView == 0 && !itemstack.isEmpty())
         {
-            if (itemstack.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN))
+            Item item = itemstack.getItem();
+            if (item == Item.getItemFromBlock(Blocks.PUMPKIN))
             {
                 renderPumpkinOverlay(res);
             }
             else
             {
-                itemstack.getItem().renderHelmetOverlay(itemstack, mc.player, res, partialTicks);
+                item.renderHelmetOverlay(itemstack, mc.player, res, partialTicks);
             }
         }
 
diff --git a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
index 7a719f67da..0e29e0766c 100644
--- a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
+++ b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
@@ -217,7 +217,7 @@ public class UniversalBucket extends Item
 
         // not for us to handle
         ItemStack emptyBucket = event.getEmptyBucket();
-        if (emptyBucket == null ||
+        if (emptyBucket.isEmpty() ||
                 !emptyBucket.isItemEqual(getEmpty()) ||
                 (isNbtSensitive() && ItemStack.areItemStackTagsEqual(emptyBucket, getEmpty())))
         {