Bug 888206 - Avoiding crash during startup
Merge pull request #10744 from lodr/bug-888206-avoiding-crash-during-startup

Bug 888206 - Avoiding crash during startup
r=arcturus