Change from .nil? to .blank?