[forge-commits] [forge/core] 8f2dd5: Added null check for possible addons