Jon has fixed a number of NPEs see P4 37733, 37712. There is a way to fix these in a more fundamental way. Rafi should fix. This will also resolve bug 107815.
Fixed @37843.