Add lint of a null check then spread or expand other lint

Add lint of a null check then spread or expand other lint #2565