Guard against crash on startup

Change-Id: I06f4ccba63cef7eb0971d8b0bfa143de2ed5e53a
Fixes: 71636566
Test: manual; boottest
1 file changed