Fix potential crash loop

Bug 27548047

Change-Id: I10648ccb2fd17464e18308846b910efa129ce126
2 files changed