Added check to make sure not None;