Making things NaN proof