Some modifications to be bale to diagnose NPEs better