Handle missing values even better