Handle nil and blank values as well