Merge "Stop silently dropping a NullPointerException"
am: d99ca07884

Change-Id: I11e76cf1174057e2178f52faeae8e225062d1488