Add null-check when adding starting window

Test: Boot device
Change-Id: I5ecc09b047f6cc9246bddd419fa22051c8933562
Fixes: 34343761
1 file changed