Merge "Stop silently dropping a NullPointerException" am: d99ca07884
am: 66c4dc0757

Change-Id: I6fb1b41660b61c83a1f6883df823d2840f974de3