Fix issue where an empty mapping result would not trigger orphaned object deletion