[1.2] Eradicate NPEs