Change to use NULL for empty pointers