am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf

* commit '62dacd6797f6aab0f096e440418cd5fe4e9d9ea3':
  Uncommenting throw when item not contained in sBgItemsIdMap