bug 1075585: Potential NPEs fixed through fault injection testing