Merging 9d01abd399bfa3cdaaeac19328ebf8bdac477f92 - adding null lore checks