Fix missing value checks