Fix rare NPE

Bug: 8191673
Change-Id: I72ce7e78807c011858238f96c02a9500f930fb01