Don't call empty? on a nil value (and don't return a nil value)