diff --git a/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs b/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
index 4fd786809..a47a43543 100644
--- a/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
+++ b/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
@@ -206,7 +206,7 @@ namespace Server.Items
             var result = base.OnCraft(quality, makersMark, from, craftSystem, typeRes, tool, craftItem, resHue);
             if (Core.ML)
             {
-                ApplyWoodBonuses(typeRes);
+                ApplyWoodBonuses(typeRes ?? craftItem.Resources[0].ItemType);
             }
 
             return result;
diff --git a/Projects/UOContent/Misc/ResourceInfo.cs b/Projects/UOContent/Misc/ResourceInfo.cs
index 521216d58..dae8b4836 100644
--- a/Projects/UOContent/Misc/ResourceInfo.cs
+++ b/Projects/UOContent/Misc/ResourceInfo.cs
@@ -736,7 +736,7 @@ namespace Server.Items
         /// </summary>
         public static CraftResource GetFromType(Type resourceType)
         {
-            if (m_TypeTable == null)
+            if (resourceType == null || m_TypeTable == null)
             {
                 return CraftResource.None;
             }