Move zero validation to a better, central place