Fix potential crash
(regression introduced with fix for 7406402)

bug:7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
2 files changed