fixing my null error :/