Fixed !== null testing