Guard against NPE

Test: manual
Change-Id: I4ffc6aafb75b967f8a0a0ca0f0a3aeeb5d6e8c85
Fixes: 65229458
1 file changed