Bug 888206 - Avoiding crash during startup