Tidy a use of null