Fix empty? for nil bug