Changed #nil? to #blank?