Correctly check address for null