Moved Null Check to actually be useful