Changed empty? to nil? again.