--- ../src-base/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
+++ ../src-work/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
@@ -90,9 +90,9 @@
             {
                 this.field_92102_a = new ItemStack(Items.field_151152_bP);
 
+                nbttagcompound = new NBTTagCompound();
                 if (l > 0)
                 {
-                    nbttagcompound = new NBTTagCompound();
                     nbttagcompound1 = new NBTTagCompound();
                     NBTTagList nbttaglist = new NBTTagList();
 
@@ -109,8 +109,8 @@
                     nbttagcompound1.func_74782_a("Explosions", nbttaglist);
                     nbttagcompound1.func_74774_a("Flight", (byte)j);
                     nbttagcompound.func_74782_a("Fireworks", nbttagcompound1);
-                    this.field_92102_a.func_77982_d(nbttagcompound);
                 }
+                this.field_92102_a.func_77982_d(nbttagcompound); //Forge BugFix: NPE Protection
 
                 return true;
             }
@@ -253,11 +253,7 @@
         for (int i = 0; i < aitemstack.length; ++i)
         {
             ItemStack itemstack = p_179532_1_.func_70301_a(i);
-
-            if (itemstack != null && itemstack.func_77973_b().func_77634_r())
-            {
-                aitemstack[i] = new ItemStack(itemstack.func_77973_b().func_77668_q());
-            }
+            aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack);
         }
 
         return aitemstack;
