Handle case where these values can be zero, and would be set to null