Looks like throwing behavior changed on FirstOrDefault, and not in a good way