The changes below have been made to return explicitly `null` in case the facet is not found.