Merge "Do checks on the fault address when we think it's an NPE."