Fix getByNaturalId() when no result found