LPS-42401 Return empty objects instead of null
LPS-42401 SF
LPS-41267 Remove unnecessary exceptions