Should this be checking if nil or valid?