Stop treating * as boolean, and check against NULL instead