changed unless to if empty / nil