Fix kit NPE the correct way