Only check for nil instead of blank