Improve null test